diff options
author | Reid Kleckner <rnk@google.com> | 2018-12-21 19:59:03 +0000 |
---|---|---|
committer | Reid Kleckner <rnk@google.com> | 2018-12-21 19:59:03 +0000 |
commit | 84a2d2968107644634cad98733dcda31f1a4857b (patch) | |
tree | bc9d3df168333b8eac064d6e83a167d5ea0de0ac | |
parent | 18be3cb6064070ef712291111c3275c1f04b6446 (diff) | |
download | bcm5719-llvm-84a2d2968107644634cad98733dcda31f1a4857b.tar.gz bcm5719-llvm-84a2d2968107644634cad98733dcda31f1a4857b.zip |
[BasicAA] Fix AA bug on dynamic allocas and stackrestore
Summary:
BasicAA has special logic for unescaped allocas, which normally applies
equally well to dynamic and static allocas. However, llvm.stackrestore
has the power to end the lifetime of dynamic allocas, without referring
to them directly.
stackrestore is already marked with the most conservative memory
modification attributes, but because the alloca is not escaped, the
normal logic produces incorrect results. I think BasicAA needs a special
case here to teach it about the relationship between dynamic allocas and
stackrestore.
Fixes PR40118
Reviewers: gbiv, efriedma, george.burgess.iv
Subscribers: hiraditya, llvm-commits
Differential Revision: https://reviews.llvm.org/D55969
llvm-svn: 349945
-rw-r--r-- | llvm/lib/Analysis/BasicAliasAnalysis.cpp | 6 | ||||
-rw-r--r-- | llvm/test/Transforms/MemCpyOpt/stackrestore.ll | 74 |
2 files changed, 80 insertions, 0 deletions
diff --git a/llvm/lib/Analysis/BasicAliasAnalysis.cpp b/llvm/lib/Analysis/BasicAliasAnalysis.cpp index b7aa395ab84..5bb85b49cb1 100644 --- a/llvm/lib/Analysis/BasicAliasAnalysis.cpp +++ b/llvm/lib/Analysis/BasicAliasAnalysis.cpp @@ -812,6 +812,12 @@ ModRefInfo BasicAAResult::getModRefInfo(ImmutableCallSite CS, !CI->getAttributes().hasAttrSomewhere(Attribute::ByVal)) return ModRefInfo::NoModRef; + // Stack restore is able to modify unescaped dynamic allocas. Assume it may + // modify them even though the alloca is not escaped. + if (auto *AI = dyn_cast<AllocaInst>(Object)) + if (!AI->isStaticAlloca() && isIntrinsicCall(CS, Intrinsic::stackrestore)) + return ModRefInfo::Mod; + // If the pointer is to a locally allocated object that does not escape, // then the call can not mod/ref the pointer unless the call takes the pointer // as an argument, and itself doesn't capture it. diff --git a/llvm/test/Transforms/MemCpyOpt/stackrestore.ll b/llvm/test/Transforms/MemCpyOpt/stackrestore.ll new file mode 100644 index 00000000000..4bead3381cc --- /dev/null +++ b/llvm/test/Transforms/MemCpyOpt/stackrestore.ll @@ -0,0 +1,74 @@ +; RUN: opt -S -memcpyopt < %s | FileCheck %s + +; PR40118: BasicAA didn't realize that stackrestore ends the lifetime of +; unescaped dynamic allocas, such as those that might come from inalloca. + +source_filename = "t.cpp" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" +target triple = "i686-unknown-windows-msvc19.14.26433" + +@str = internal constant [9 x i8] c"abcdxxxxx" + + +; Test that we can propagate memcpy through an unescaped dynamic alloca across +; a call to @external. + +define i32 @test_norestore(i32 %n) { + %tmpmem = alloca [10 x i8], align 4 + %tmp = getelementptr inbounds [10 x i8], [10 x i8]* %tmpmem, i32 0, i32 0 + + ; Make a dynamic alloca, initialize it. + %p = alloca i8, i32 %n, align 4 + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %p, i8* align 1 getelementptr inbounds ([9 x i8], [9 x i8]* @str, i32 0, i32 0), i32 9, i1 false) + + ; This extra byte exists to prevent memcpyopt from propagating @str. + %p10 = getelementptr inbounds i8, i8* %p, i32 9 + store i8 0, i8* %p10 + + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %tmp, i8* %p, i32 10, i1 false) + call void @external() + %heap = call i8* @malloc(i32 9) + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %heap, i8* %tmp, i32 9, i1 false) + call void @useit(i8* %heap) + ret i32 0 +} + +; CHECK-LABEL: define i32 @test_norestore(i32 %n) +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i32(i8* %p, i8* align 1 getelementptr inbounds ([9 x i8], [9 x i8]* @str, i32 0, i32 0), i32 9, i1 false) +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i32(i8* %tmp, i8* %p, i32 10, i1 false) +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i32(i8* %heap, i8* %p, i32 9, i1 false) + + +; Do not propagate memcpy from %p across the stackrestore. + +define i32 @test_stackrestore() { + %tmpmem = alloca [10 x i8], align 4 + %tmp = getelementptr inbounds [10 x i8], [10 x i8]* %tmpmem, i32 0, i32 0 + %inalloca.save = tail call i8* @llvm.stacksave() + %argmem = alloca inalloca [10 x i8], align 4 + %p = getelementptr inbounds [10 x i8], [10 x i8]* %argmem, i32 0, i32 0 + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %p, i8* align 1 getelementptr inbounds ([9 x i8], [9 x i8]* @str, i32 0, i32 0), i32 9, i1 false) + + ; This extra byte exists to prevent memcpyopt from propagating @str. + %p10 = getelementptr inbounds [10 x i8], [10 x i8]* %argmem, i32 0, i32 9 + store i8 0, i8* %p10 + + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %tmp, i8* %p, i32 10, i1 false) + call void @llvm.stackrestore(i8* %inalloca.save) + %heap = call i8* @malloc(i32 9) + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %heap, i8* %tmp, i32 9, i1 false) + call void @useit(i8* %heap) + ret i32 0 +} + +; CHECK-LABEL: define i32 @test_stackrestore() +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i32(i8* %p, i8* align 1 getelementptr inbounds ([9 x i8], [9 x i8]* @str, i32 0, i32 0), i32 9, i1 false) +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i32(i8* %tmp, i8* %p, i32 10, i1 false) +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i32(i8* %heap, i8* %tmp, i32 9, i1 false) + +declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture readonly, i32, i1) +declare i8* @llvm.stacksave() +declare void @llvm.stackrestore(i8*) +declare i8* @malloc(i32) +declare void @useit(i8*) +declare void @external() |