summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2017-02-09 21:46:49 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2017-02-09 21:46:49 +0000
commit714d9d22ad7bd19679a042239b9e384d38303610 (patch)
treede174277a5036118fbc2fd14edc7d0b8d6676bb4 /llvm/lib
parent857aba44106ac543cbd8210cff56db46e7287c84 (diff)
downloadbcm5719-llvm-714d9d22ad7bd19679a042239b9e384d38303610.tar.gz
bcm5719-llvm-714d9d22ad7bd19679a042239b9e384d38303610.zip
[LoadCombine] Fix combining of loads which span an aliasing store.
Fixes PR31517 Differential Revision: https://reviews.llvm.org/D28922 llvm-svn: 294632
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Transforms/Scalar/LoadCombine.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Scalar/LoadCombine.cpp b/llvm/lib/Transforms/Scalar/LoadCombine.cpp
index 389f1c595aa..61b7804b59b 100644
--- a/llvm/lib/Transforms/Scalar/LoadCombine.cpp
+++ b/llvm/lib/Transforms/Scalar/LoadCombine.cpp
@@ -245,13 +245,17 @@ bool LoadCombine::runOnBasicBlock(BasicBlock &BB) {
bool Combined = false;
unsigned Index = 0;
for (auto &I : BB) {
- if (I.mayThrow() || (I.mayWriteToMemory() && AST.containsUnknown(&I))) {
+ if (I.mayThrow() || AST.containsUnknown(&I)) {
if (combineLoads(LoadMap))
Combined = true;
LoadMap.clear();
AST.clear();
continue;
}
+ if (I.mayWriteToMemory()) {
+ AST.add(&I);
+ continue;
+ }
LoadInst *LI = dyn_cast<LoadInst>(&I);
if (!LI)
continue;
OpenPOWER on IntegriCloud