Use GVN in LTO instead of GCSE+LoadVN.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50036 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp
index ff9ba91d4ea124c0351a9289a06360128fca1c72..7e0823edf1bd6a9cec3ff51fdf11a0c4241a636f 100644 (file)
--- a/tools/lto/lto.cpp
+++ b/tools/lto/lto.cpp
@@ -330,8 +330,7 @@ LTO::optimize(Module *M, std::ostream &Out,
   Passes.add(createGlobalsModRefPass());      // IP alias analysis
   
   Passes.add(createLICMPass());               // Hoist loop invariants
-  Passes.add(createLoadValueNumberingPass()); // GVN for load instrs
-  Passes.add(createGCSEPass());               // Remove common subexprs
+  Passes.add(createGVNPass());               // Remove common subexprs
   Passes.add(createDeadStoreEliminationPass()); // Nuke dead stores
 
   // Cleanup and simplify the code after the scalar optimizations.

diff --git a/tools/lto2/LTOCodeGenerator.cpp b/tools/lto2/LTOCodeGenerator.cpp
index b7962be50bec7afd6e14fa588989068a144de149..db27145bbf9e3b0549e06579e0fbc16cf97dc381 100644 (file)
--- a/tools/lto2/LTOCodeGenerator.cpp
+++ b/tools/lto2/LTOCodeGenerator.cpp
@@ -377,8 +377,7 @@ bool LTOCodeGenerator::generateAssemblyCode(std::ostream& out, std::string& errM
     passes.add(createGlobalsModRefPass());      // IP alias analysis
 
     passes.add(createLICMPass());               // Hoist loop invariants
-    passes.add(createLoadValueNumberingPass()); // GVN for load instrs
-    passes.add(createGCSEPass());               // Remove common subexprs
+    passes.add(createGVNPass());               // Remove common subexprs
     passes.add(createDeadStoreEliminationPass()); // Nuke dead stores
 
     // Cleanup and simplify the code after the scalar optimizations.