diff --git a/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h b/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h --- a/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h +++ b/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h @@ -157,8 +157,6 @@ bool SLPVectorize; bool LoopVectorize; bool LoopsInterleaved; - bool RerollLoops; - bool NewGVN; bool DisableGVNLoadPRE; bool ForgetAllSCEVInLoopUnroll; bool VerifyInput; diff --git a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp --- a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp +++ b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp @@ -234,8 +234,7 @@ if (OptLevel > 1) { MPM.add(createMergedLoadStoreMotionPass()); // Merge ld/st in diamonds - MPM.add(NewGVN ? createNewGVNPass() - : createGVNPass(DisableGVNLoadPRE)); // Remove redundancies + MPM.add(createGVNPass(DisableGVNLoadPRE)); // Remove redundancies } MPM.add(createSCCPPass()); // Constant prop with SCCP