diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/CodeGen/SafeStackColoring.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Transforms/SafeStack/AArch64/unreachable.ll | 23 |
2 files changed, 26 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SafeStackColoring.cpp b/llvm/lib/CodeGen/SafeStackColoring.cpp index 329458778a9..b1914b5d380 100644 --- a/llvm/lib/CodeGen/SafeStackColoring.cpp +++ b/llvm/lib/CodeGen/SafeStackColoring.cpp @@ -172,7 +172,9 @@ void StackColoring::calculateLocalLiveness() { BitVector LocalLiveIn; for (auto *PredBB : predecessors(BB)) { LivenessMap::const_iterator I = BlockLiveness.find(PredBB); - assert(I != BlockLiveness.end() && "Predecessor not found"); + // If a predecessor is unreachable, ignore it. + if (I == BlockLiveness.end()) + continue; LocalLiveIn |= I->second.LiveOut; } diff --git a/llvm/test/Transforms/SafeStack/AArch64/unreachable.ll b/llvm/test/Transforms/SafeStack/AArch64/unreachable.ll new file mode 100644 index 00000000000..53ed690ebb0 --- /dev/null +++ b/llvm/test/Transforms/SafeStack/AArch64/unreachable.ll @@ -0,0 +1,23 @@ +; RUN: opt -safe-stack -safe-stack-coloring -S -mtriple=aarch64-linux-android < %s -o - | FileCheck %s + +define void @foo() nounwind uwtable safestack { +entry: +; CHECK: %[[TP:.*]] = call i8* @llvm.thread.pointer() +; CHECK: %[[SPA0:.*]] = getelementptr i8, i8* %[[TP]], i32 72 +; CHECK: %[[SPA:.*]] = bitcast i8* %[[SPA0]] to i8** +; CHECK: %[[USP:.*]] = load i8*, i8** %[[SPA]] +; CHECK: %[[USST:.*]] = getelementptr i8, i8* %[[USP]], i32 -16 +; CHECK: store i8* %[[USST]], i8** %[[SPA]] + + %a = alloca i8, align 8 + br label %ret + +ret: + ret void + +dead: + call void @Capture(i8* %a) + br label %ret +} + +declare void @Capture(i8*) |
