[llvm] r317667 - Revert "[CGP] Enable extending scope of optimizeMemoryInst"

[Serguei Katkov via llvm-commits]

Author: skatkov
Date: Tue Nov  7 21:38:54 2017
New Revision: 317667

URL: http://llvm.org/viewvc/llvm-project?rev=317667&view=rev
Log:
Revert "[CGP] Enable extending scope of optimizeMemoryInst"

Revert the patch r317665 causing buildbot failures.


Modified:
    llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp

Modified: llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp?rev=317667&r1=317666&r2=317667&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp Tue Nov  7 21:38:54 2017
@@ -190,7 +190,7 @@ EnableTypePromotionMerge("cgp-type-promo
     " the other."), cl::init(true));
 
 static cl::opt<bool> DisableComplexAddrModes(
-    "disable-complex-addr-modes", cl::Hidden, cl::init(false),
+    "disable-complex-addr-modes", cl::Hidden, cl::init(true),
     cl::desc("Disables combining addressing modes with different parts "
              "in optimizeMemoryInst."));