Disable folding g-e-p instructions into loads and stores.

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

diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 7092989bf442d75839712470b4e469703d604ab2..1ff2c0fecddbae97bada5d394c68cf13640793ed 100644 (file)
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -499,6 +499,8 @@ Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) {
 // instruction
 //
 Instruction *InstCombiner::visitMemAccessInst(MemAccessInst &MAI) {
+  return 0;   // DISABLE FOLDING.  GEP is now the only MAI!
+
   GetElementPtrInst *Src =
     dyn_cast<GetElementPtrInst>(MAI.getPointerOperand());
   if (!Src) return 0;