diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-11-25 18:07:39 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-11-25 18:07:39 +0000 |
| commit | ddc3c964657cc0be4994ddfaf056d5ec6bb11e5b (patch) | |
| tree | 8e387ca91fe34f49c09be1dd18f175ff066a42e6 /lib/CodeGen/SelectionDAG | |
| parent | 975e958dbc12ba412385b721100fc1c830b0e3ab (diff) | |
| download | external_llvm-ddc3c964657cc0be4994ddfaf056d5ec6bb11e5b.zip external_llvm-ddc3c964657cc0be4994ddfaf056d5ec6bb11e5b.tar.gz external_llvm-ddc3c964657cc0be4994ddfaf056d5ec6bb11e5b.tar.bz2 | |
Merging r195636:
------------------------------------------------------------------------
r195636 | aemerson | 2013-11-25 03:24:18 -0800 (Mon, 25 Nov 2013) | 2 lines
Revert r195599 as it broke the builds.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@195671 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/SelectionDAG')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 805cc9e..c126a53 100644 --- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -8692,11 +8692,6 @@ bool DAGCombiner::MergeConsecutiveStores(StoreSDNode* St) { 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(); |