[llvm] 4a77d96 - [LegacyPM] remove unset variables in PassManagerBuilder

[Mikhail Goncharov via llvm-commits]

Author: Mikhail Goncharov
Date: 2022-11-15T17:57:44+01:00
New Revision: 4a77d96903c996076c9df0f696a7ba7ca2de966a

URL: https://github.com/llvm/llvm-project/commit/4a77d96903c996076c9df0f696a7ba7ca2de966a
DIFF: https://github.com/llvm/llvm-project/commit/4a77d96903c996076c9df0f696a7ba7ca2de966a.diff

LOG: [LegacyPM] remove unset variables in PassManagerBuilder

D137915 stopped setting this variables but NewGVN was still used and caused asan failure

Differential Revision: https://reviews.llvm.org/D138034

Added: 
    

Modified: 
    llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
    llvm/lib/Transforms/IPO/PassManagerBuilder.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h b/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
index 2e882eeb8bacc..81a3b370f969b 100644
--- a/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
+++ b/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
@@ -157,8 +157,6 @@ class PassManagerBuilder {
   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
index a81a3fb8d891f..05d2ab4911d12 100644
--- a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
+++ b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
@@ -234,8 +234,7 @@ void PassManagerBuilder::addFunctionSimplificationPasses(
 
   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