commit 9200bb08f9c1308bb692483f8e4e39ac90b5474b
author Bill Wendling <isanbard@gmail.com> Mon Nov 25 18:05:22 2013 +0000
committer Bill Wendling <isanbard@gmail.com> Mon Nov 25 18:05:22 2013 +0000
tree 2e706948b41a260bec50db3f49ff7b428eed2d3e
parent 956bc117d9a5afcb3adb39ceb84c480ff030c753

Unrevert r195599 with testcase fix.

I'm not sure how it was checking for the wrong values...
PR18023.

llvm-svn: 195670

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index c126a53..805cc9e 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -8692,6 +8692,11 @@
         Index = STn;
         break;
       } else if (LoadSDNode *Ldn = dyn_cast<LoadSDNode>(NextInChain)) {
+        if (Ldn->isVolatile()) {
+          Index = NULL;
+          break;
+        }
+
         // Save the load node for later. Continue the scan.
         AliasLoadNodes.push_back(Ldn);
         NextInChain = Ldn->getChain().getNode();