maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ORC][ORC-RT] Make WrapperFunctionCall::Create support void functions. 

Serialized calls to void-wrapper-functions should have zero bytes of argument
data, but accessing ArgData[0] may (and will, in the case of SmallVector) fail
if the argument data buffer is empty.

This commit fixes the issue by adding a check for empty argument buffers.
This commit is contained in:
Lang Hames 2022-09-18 17:47:12 -07:00
parent cf07277fb4
commit 0e43f3b04d
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/orc/tests/unit/wrapper_function_utils_test.cpp
View File

@ -66,6 +66,10 @@ TEST(WrapperFunctionUtilsTest, WrapperFunctionResultFromOutOfBandError) {
EXPECT_TRUE(strcmp(R.getOutOfBandError(), TestString) == 0);
}
TEST(WrapperFunctionUtilsTest, WrapperFunctionCCallCreateEmpty) {
EXPECT_TRUE(!!WrapperFunctionCall::Create<SPSArgList<>>(ExecutorAddr()));
}
static void voidNoop() {}
static __orc_rt_CWrapperFunctionResult voidNoopWrapper(const char *ArgData,

3
compiler-rt/lib/orc/wrapper_function_utils.h
View File

@ -408,7 +408,8 @@ public:
const ArgTs &...Args) {
ArgDataBufferType ArgData;
ArgData.resize(SPSSerializer::size(Args...));
SPSOutputBuffer OB(&ArgData[0], ArgData.size());
SPSOutputBuffer OB(ArgData.empty() ? nullptr : ArgData.data(),
ArgData.size());
if (SPSSerializer::serialize(OB, Args...))
return WrapperFunctionCall(FnAddr, std::move(ArgData));
return make_error<StringError>("Cannot serialize arguments for "

3
llvm/include/llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h
View File

@ -636,7 +636,8 @@ public:
const ArgTs &...Args) {
ArgDataBufferType ArgData;
ArgData.resize(SPSSerializer::size(Args...));
SPSOutputBuffer OB(&ArgData[0], ArgData.size());
SPSOutputBuffer OB(ArgData.empty() ? nullptr : ArgData.data(),
ArgData.size());
if (SPSSerializer::serialize(OB, Args...))
return WrapperFunctionCall(FnAddr, std::move(ArgData));
return make_error<StringError>("Cannot serialize arguments for "

5
llvm/unittests/ExecutionEngine/Orc/WrapperFunctionUtilsTest.cpp
View File

@ -58,6 +58,11 @@ TEST(WrapperFunctionUtilsTest, WrapperFunctionResultFromOutOfBandError) {
EXPECT_TRUE(strcmp(R.getOutOfBandError(), TestString) == 0);
}
TEST(WrapperFunctionUtilsTest, WrapperFunctionCCallCreateEmpty) {
EXPECT_THAT_EXPECTED(
WrapperFunctionCall::Create<SPSArgList<>>(ExecutorAddr()), Succeeded());
}
static void voidNoop() {}
class AddClass {