diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-28 07:18:55 +0100 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-28 07:18:55 +0100 |
commit | f933ab3d6d0d1218bf5f575ae2f5de6f657d23ca (patch) | |
tree | 149fbe7587fd3af4972d7a5c3196042ab362f05c /lib/CodeGen/SelectionDAG | |
parent | 41ef0ec9e25a34ffb598ce0d5749b3bfa3b0b929 (diff) | |
parent | 3668de5ba6ce154b365ef2f0b001be155c014e6f (diff) | |
download | llvm-f933ab3d6d0d1218bf5f575ae2f5de6f657d23ca.tar.gz llvm-f933ab3d6d0d1218bf5f575ae2f5de6f657d23ca.tar.bz2 llvm-f933ab3d6d0d1218bf5f575ae2f5de6f657d23ca.tar.xz |
Merge branch 'release-3.2' into embtk-support-release-3.2
Diffstat (limited to 'lib/CodeGen/SelectionDAG')
-rw-r--r-- | lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 5416a5c1d7..37d7731aa1 100644 --- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -7728,7 +7728,18 @@ bool DAGCombiner::MergeConsecutiveStores(StoreSDNode* St) { if (StoreNodes[i].MemNode == EarliestOp) continue; StoreSDNode *St = cast<StoreSDNode>(StoreNodes[i].MemNode); - DAG.ReplaceAllUsesOfValueWith(SDValue(St, 0), St->getChain()); + // ReplaceAllUsesWith will replace all uses that existed when it was + // called, but graph optimizations may cause new ones to appear. For + // example, the case in pr14333 looks like + // + // St's chain -> St -> another store -> X + // + // And the only difference from St to the other store is the chain. + // When we change it's chain to be St's chain they become identical, + // get CSEed and the net result is that X is now a use of St. + // Since we know that St is redundant, just iterate. + while (!St->use_empty()) + DAG.ReplaceAllUsesWith(SDValue(St, 0), St->getChain()); removeFromWorkList(St); DAG.DeleteNode(St); } |