This is an archive of the discontinued LLVM Phabricator instance.

Differential D75307

[CallPromotionUtils] Add missing promotion legality check to tryPromoteCall.
ClosedPublic

Authored by hjyamauchi on Feb 27 2020, 2:39 PM.

Details

Reviewers
davidxl
Commits
rG41e06ae7ba91: [CallPromotionUtils] Add missing promotion legality check to tryPromoteCall.
Summary

This fixes the crash that led to the revert of D69591.

Diff Detail

Event Timeline

hjyamauchi created this revision.Feb 27 2020, 2:39 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 27 2020, 2:39 PM
Herald added a subscriber: hiraditya. · View Herald Transcript
Harbormaster completed remote builds in B47515: Diff 247113.Feb 27 2020, 2:51 PM
davidxl accepted this revision.Feb 27 2020, 2:57 PM

lgtm

This revision is now accepted and ready to land.Feb 27 2020, 2:57 PM
Closed by commit rG41e06ae7ba91: [CallPromotionUtils] Add missing promotion legality check to tryPromoteCall. (authored by hjyamauchi). · Explain WhyFeb 28 2020, 9:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Transforms/
Utils/
3 lines
unittests/
Transforms/
Utils/
47 lines

Diff 247113

llvm/lib/Transforms/Utils/CallPromotionUtils.cpp

Show First 20 Lines • Show All 505 Lines • ▼ Show 20 Lines Constant *Ptr = getPointerAtOffset(VTableGVInitializer,
VTableGVOffset.getZExtValue(), VTableGVOffset.getZExtValue(),
*M); *M);
if (!Ptr) if (!Ptr)
return false; // No constant (function) pointer found. return false; // No constant (function) pointer found.
Function *DirectCallee = dyn_cast<Function>(Ptr->stripPointerCasts()); Function *DirectCallee = dyn_cast<Function>(Ptr->stripPointerCasts());
if (!DirectCallee) if (!DirectCallee)
return false; // No function pointer found. return false; // No function pointer found.
if (!isLegalToPromote(CS, DirectCallee))
return false;
// Success. // Success.
promoteCall(CS, DirectCallee); promoteCall(CS, DirectCallee);
return true; return true;
} }
#undef DEBUG_TYPE #undef DEBUG_TYPE

llvm/unittests/Transforms/Utils/CallPromotionUtilsTest.cpp

Show First 20 Lines • Show All 324 Lines • ▼ Show 20 Lines)IR");
ASSERT_FALSE(CS2.getCalledFunction()); ASSERT_FALSE(CS2.getCalledFunction());
bool IsPromoted2 = tryPromoteCall(CS2); bool IsPromoted2 = tryPromoteCall(CS2);
EXPECT_TRUE(IsPromoted2); EXPECT_TRUE(IsPromoted2);
GV = M->getNamedValue("_ZN1A3vf2Ev"); GV = M->getNamedValue("_ZN1A3vf2Ev");
ASSERT_TRUE(GV); ASSERT_TRUE(GV);
F = dyn_cast<Function>(GV); F = dyn_cast<Function>(GV);
EXPECT_EQ(F, CS2.getCalledFunction()); EXPECT_EQ(F, CS2.getCalledFunction());
} }
// Check that it isn't crashing due to missing promotion legality.
TEST(CallPromotionUtilsTest, TryPromoteCall_Legality) {
LLVMContext C;
std::unique_ptr<Module> M = parseIR(C,
R"IR(
%struct1 = type <{ i32, i64 }>
%struct2 = type <{ i32, i64 }>
%class.Impl = type <{ %class.Interface, i32, [4 x i8] }>
%class.Interface = type { i32 (...)** }
@_ZTV4Impl = constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (%struct2 (%class.Impl*)* @_ZN4Impl3RunEv to i8*)] }
define %struct1 @f() {
entry:
%o = alloca %class.Impl
%base = getelementptr %class.Impl, %class.Impl* %o, i64 0, i32 0, i32 0
store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV4Impl, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %base
%f = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 1
store i32 3, i32* %f
%base.i = getelementptr inbounds %class.Impl, %class.Impl* %o, i64 0, i32 0
%c = bitcast %class.Interface* %base.i to %struct1 (%class.Interface*)***
%vtable.i = load %struct1 (%class.Interface*)**, %struct1 (%class.Interface*)*** %c
%fp = load %struct1 (%class.Interface*)*, %struct1 (%class.Interface*)** %vtable.i
%rv = call %struct1 %fp(%class.Interface* nonnull %base.i)
ret %struct1 %rv
}
declare %struct2 @_ZN4Impl3RunEv(%class.Impl* %this)
)IR");
auto *GV = M->getNamedValue("f");
ASSERT_TRUE(GV);
auto *F = dyn_cast<Function>(GV);
ASSERT_TRUE(F);
Instruction *Inst = &F->front().front();
auto *AI = dyn_cast<AllocaInst>(Inst);
ASSERT_TRUE(AI);
Inst = &*++F->front().rbegin();
auto *CI = dyn_cast<CallInst>(Inst);
ASSERT_TRUE(CI);
CallSite CS(CI);
ASSERT_FALSE(CS.getCalledFunction());
bool IsPromoted = tryPromoteCall(CS);
EXPECT_FALSE(IsPromoted);
}