summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanjoy Das <sanjoy@playingwithpointers.com>2016-06-13 19:55:04 +0000
committerSanjoy Das <sanjoy@playingwithpointers.com>2016-06-13 19:55:04 +0000
commitd0bdf3e02ba61a704bae67f188ff7e5a8be135ed (patch)
tree876b50fd5f819e9059bb48242e8990375ba3e533
parent99646871a74669a33ccd4c004a2087e2a348ddd6 (diff)
downloadbcm5719-llvm-d0bdf3e02ba61a704bae67f188ff7e5a8be135ed.tar.gz
bcm5719-llvm-d0bdf3e02ba61a704bae67f188ff7e5a8be135ed.zip
Fix AAResults::callCapturesBefore for operand bundles
Summary: AAResults::callCapturesBefore would previously ignore operand bundles. It was possible for a later instruction to miss its memory dependency on a call site that would only access the pointer through a bundle. Patch by Oscar Blumberg! Reviewers: sanjoy Differential Revision: http://reviews.llvm.org/D21286 llvm-svn: 272580
-rw-r--r--llvm/lib/Analysis/AliasAnalysis.cpp2
-rw-r--r--llvm/test/CodeGen/X86/statepoint-memdep.ll17
2 files changed, 18 insertions, 1 deletions
diff --git a/llvm/lib/Analysis/AliasAnalysis.cpp b/llvm/lib/Analysis/AliasAnalysis.cpp
index 117f8cb123f..263dd48bfea 100644
--- a/llvm/lib/Analysis/AliasAnalysis.cpp
+++ b/llvm/lib/Analysis/AliasAnalysis.cpp
@@ -445,7 +445,7 @@ ModRefInfo AAResults::callCapturesBefore(const Instruction *I,
unsigned ArgNo = 0;
ModRefInfo R = MRI_NoModRef;
- for (ImmutableCallSite::arg_iterator CI = CS.arg_begin(), CE = CS.arg_end();
+ for (auto CI = CS.data_operands_begin(), CE = CS.data_operands_end();
CI != CE; ++CI, ++ArgNo) {
// Only look at the no-capture or byval pointer arguments. If this
// pointer were passed to arguments that were neither of these, then it
diff --git a/llvm/test/CodeGen/X86/statepoint-memdep.ll b/llvm/test/CodeGen/X86/statepoint-memdep.ll
new file mode 100644
index 00000000000..c22a25ed7d8
--- /dev/null
+++ b/llvm/test/CodeGen/X86/statepoint-memdep.ll
@@ -0,0 +1,17 @@
+; RUN: opt -S -dse < %s | FileCheck %s
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define void @f() {
+ ; CHECK-LABEL: @f(
+ %s = alloca i64
+ ; Verify that this first store is not considered killed by the second one
+ ; since it could be observed from the deopt continuation.
+ ; CHECK: store i64 1, i64* %s
+ store i64 1, i64* %s
+ call void @g() [ "deopt"(i64* %s) ]
+ store i64 0, i64* %s
+ ret void
+}
+
+declare void @g()
OpenPOWER on IntegriCloud