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

Remove last remnants of PR49607 migration [NFC] 

The key change (4f5e92c) to switch gc.result and gc.relocate to being readnone landed nearly two weeks ago, and we haven't seen any fallout.  Time to remove the code added to make reverting easy.
This commit is contained in:
Philip Reames 2021-04-06 07:54:13 -07:00
parent 23929af383
commit 52ecd94cfb
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Transforms/Scalar/EarlyCSE.cpp
View File

@ -109,9 +109,6 @@ struct SimpleValue {
static bool canHandle(Instruction *Inst) {
// This can only handle non-void readnone functions.
if (isa<GCRelocateInst>(Inst))
// Migration assistant for PR49607, to be removed once complete
return true;
if (CallInst *CI = dyn_cast<CallInst>(Inst))
return CI->doesNotAccessMemory() && !CI->getType()->isVoidTy();
return isa<CastInst>(Inst) || isa<UnaryOperator>(Inst) ||

4
llvm/lib/Transforms/Scalar/GVN.cpp
View File

@ -397,9 +397,7 @@ void GVN::ValueTable::add(Value *V, uint32_t num) {
}
uint32_t GVN::ValueTable::lookupOrAddCall(CallInst *C) {
// The gc.relocate specific check is to simplify migration under PR49607, and
// is to be removed once complete.
if (AA->doesNotAccessMemory(C) || isa<GCRelocateInst>(C)) {
if (AA->doesNotAccessMemory(C)) {
Expression exp = createExpr(C);
uint32_t e = assignExpNewValueNum(exp).first;
valueNumbering[C] = e;