summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRichard Osborne <richard@xmos.com>2012-11-05 10:48:24 +0000
committerRichard Osborne <richard@xmos.com>2012-11-05 10:48:24 +0000
commit544533301e51e697abf7cc05979208d0ffc30973 (patch)
treee0e4e5710a400a766d785cb237d2cb63571d5b9e /lib
parente507fc6eeaddbb12fc6fabf43f6a6ce19651d689 (diff)
downloadllvm-544533301e51e697abf7cc05979208d0ffc30973.tar.gz
llvm-544533301e51e697abf7cc05979208d0ffc30973.tar.bz2
llvm-544533301e51e697abf7cc05979208d0ffc30973.tar.xz
Don't infer whether a value is captured in the current function from the
'nocapture' attribute. The nocapture attribute only specifies that no copies are made that outlive the function. This isn't the same as there being no copies at all. This fixes PR14045. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167381 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Analysis/BasicAliasAnalysis.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp
index 131b9d65e6..4bb93ee88a 100644
--- a/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/lib/Analysis/BasicAliasAnalysis.cpp
@@ -58,12 +58,12 @@ static bool isNonEscapingLocalObject(const Value *V) {
// then it has not escaped before entering the function. Check if it escapes
// inside the function.
if (const Argument *A = dyn_cast<Argument>(V))
- if (A->hasByValAttr() || A->hasNoAliasAttr()) {
- // Don't bother analyzing arguments already known not to escape.
- if (A->hasNoCaptureAttr())
- return true;
+ if (A->hasByValAttr() || A->hasNoAliasAttr())
+ // Note even if the argument is marked nocapture we still need to check
+ // for copies made inside the function. The nocapture attribute only
+ // specifies that there are no copies made that outlive the function.
return !PointerMayBeCaptured(V, false, /*StoreCaptures=*/true);
- }
+
return false;
}