commit adb9c03e413788d4d67d28e7837b1fa3a3f9fdfb
author Evan Cheng <evan.cheng@apple.com> Fri Mar 11 00:48:56 2011 +0000
committer Evan Cheng <evan.cheng@apple.com> Fri Mar 11 00:48:56 2011 +0000
tree b40befec3df6c89bfcfc40d1fcdde36b66c76799
parent 24e99aa8337b0fd71f1220d664c529c3651e09e2

Avoid replacing the value of a directly stored load with the stored value if the load is indexed. rdar://9117613.

llvm-svn: 127440

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 4c70bc3..f9f8985 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -5862,8 +5862,7 @@
   // value.
   // TODO: Handle store large -> read small portion.
   // TODO: Handle TRUNCSTORE/LOADEXT
-  if (LD->getExtensionType() == ISD::NON_EXTLOAD &&
-      !LD->isVolatile()) {
+  if (ISD::isNormalLoad(N) && !LD->isVolatile()) {
     if (ISD::isNON_TRUNCStore(Chain.getNode())) {
       StoreSDNode *PrevST = cast<StoreSDNode>(Chain);
       if (PrevST->getBasePtr() == Ptr &&