diff --git a/llvm/lib/Transforms/Scalar/EarlyCSE.cpp b/llvm/lib/Transforms/Scalar/EarlyCSE.cpp index 9c7d43078821..125e00482210 100644 --- a/llvm/lib/Transforms/Scalar/EarlyCSE.cpp +++ b/llvm/lib/Transforms/Scalar/EarlyCSE.cpp @@ -109,9 +109,6 @@ struct SimpleValue { static bool canHandle(Instruction *Inst) { // This can only handle non-void readnone functions. - if (isa(Inst)) - // Migration assistant for PR49607, to be removed once complete - return true; if (CallInst *CI = dyn_cast(Inst)) return CI->doesNotAccessMemory() && !CI->getType()->isVoidTy(); return isa(Inst) || isa(Inst) || diff --git a/llvm/lib/Transforms/Scalar/GVN.cpp b/llvm/lib/Transforms/Scalar/GVN.cpp index 40eff58650f1..6d5042165ad8 100644 --- a/llvm/lib/Transforms/Scalar/GVN.cpp +++ b/llvm/lib/Transforms/Scalar/GVN.cpp @@ -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(C)) { + if (AA->doesNotAccessMemory(C)) { Expression exp = createExpr(C); uint32_t e = assignExpNewValueNum(exp).first; valueNumbering[C] = e;