summaryrefslogtreecommitdiff
path: root/lib/Target/X86/X86ISelDAGToDAG.cpp
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2013-01-06 19:00:15 +0000
committerEvan Cheng <evan.cheng@apple.com>2013-01-06 19:00:15 +0000
commit700843ec2c4cb4aa442377809c6ebb3ae3030c61 (patch)
treebf8225bf3559cfb593f53cb2c97e2a5e05e611f9 /lib/Target/X86/X86ISelDAGToDAG.cpp
parentc6b4936a59234704b788532de36d860f14b45e82 (diff)
downloadllvm-700843ec2c4cb4aa442377809c6ebb3ae3030c61.tar.gz
llvm-700843ec2c4cb4aa442377809c6ebb3ae3030c61.tar.bz2
llvm-700843ec2c4cb4aa442377809c6ebb3ae3030c61.tar.xz
Fix for PR14739. It's not safe to fold a load into a call across a store. Thanks to Nick Lewycky for the initial patch.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171665 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86ISelDAGToDAG.cpp')
-rw-r--r--lib/Target/X86/X86ISelDAGToDAG.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index c1eaa0e654..935f9bd715 100644
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -420,6 +420,11 @@ static bool isCalleeLoad(SDValue Callee, SDValue &Chain, bool HasCallSeq) {
if (!Chain.getNumOperands())
return false;
+ // Since we are not checking for AA here, conservatively abort if the chain
+ // writes to memory. It's not safe to move the callee (a load) across a store.
+ if (isa<MemSDNode>(Chain.getNode()) &&
+ cast<MemSDNode>(Chain.getNode())->writeMem())
+ return false;
if (Chain.getOperand(0).getNode() == Callee.getNode())
return true;
if (Chain.getOperand(0).getOpcode() == ISD::TokenFactor &&