summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Transforms/Scalar
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2015-06-01 17:20:31 +0000
committerOwen Anderson <resistor@mac.com>2015-06-01 17:20:31 +0000
commit15d180550448a7561e5d3c7e1ffa22602f2b3ed7 (patch)
treeddd1ad199183f01c9b9dffe3e3898d9d7a408292 /llvm/lib/Transforms/Scalar
parentbfca0d7f7b1711e860c132491ed52b4efcb29aaa (diff)
downloadbcm5719-llvm-15d180550448a7561e5d3c7e1ffa22602f2b3ed7.tar.gz
bcm5719-llvm-15d180550448a7561e5d3c7e1ffa22602f2b3ed7.zip
Teach the IR Sink pass to (conservatively) respect convergent annotations.
llvm-svn: 238762
Diffstat (limited to 'llvm/lib/Transforms/Scalar')
-rw-r--r--llvm/lib/Transforms/Scalar/Sink.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Scalar/Sink.cpp b/llvm/lib/Transforms/Scalar/Sink.cpp
index b169d5612f0..ec3a0186641 100644
--- a/llvm/lib/Transforms/Scalar/Sink.cpp
+++ b/llvm/lib/Transforms/Scalar/Sink.cpp
@@ -172,6 +172,12 @@ static bool isSafeToMove(Instruction *Inst, AliasAnalysis *AA,
if (isa<TerminatorInst>(Inst) || isa<PHINode>(Inst))
return false;
+ // Convergent operations can only be moved to control equivalent blocks.
+ if (auto CS = CallSite(Inst)) {
+ if (CS.hasFnAttr(Attribute::Convergent))
+ return false;
+ }
+
return true;
}
OpenPOWER on IntegriCloud