[LegacyPM] remove unset variables in PassManagerBuilder

metaflow · metaflow · commit 4a77d96903c9 · 2022-11-15T17:57:44.000+01:00
D137915 stopped setting this variables but NewGVN was still used and caused asan failure Differential Revision: https://reviews.llvm.org/D138034
diff --git 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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -234,8 +234,7 @@ void PassManagerBuilder::addFunctionSimplificationPasses(`
`234`	`234`
`235`	`235`	`if (OptLevel > 1) {`
`236`	`236`	`MPM.add(createMergedLoadStoreMotionPass()); // Merge ld/st in diamonds`
`237`		`- MPM.add(NewGVN ? createNewGVNPass()`
`238`		`- : createGVNPass(DisableGVNLoadPRE)); // Remove redundancies`
	`237`	`+ MPM.add(createGVNPass(DisableGVNLoadPRE)); // Remove redundancies`
`239`	`238`	`}`
`240`	`239`	`MPM.add(createSCCPPass()); // Constant prop with SCCP`
`241`	`240`