diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Transforms/Utils/CodeExtractor.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Transforms/HotColdSplit/unwind.ll | 37 |
2 files changed, 42 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp index a22789153df..dbcee9e5755 100644 --- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -1369,9 +1369,12 @@ Function *CodeExtractor::extractCodeRegion() { DVI->eraseFromParent(); } - // Mark the new function `noreturn` if applicable. + // Mark the new function `noreturn` if applicable. Terminators which resume + // exception propagation are treated as returning instructions. This is to + // avoid inserting traps after calls to outlined functions which unwind. bool doesNotReturn = none_of(*newFunction, [](const BasicBlock &BB) { - return isa<ReturnInst>(BB.getTerminator()); + const Instruction *Term = BB.getTerminator(); + return isa<ReturnInst>(Term) || isa<ResumeInst>(Term); }); if (doesNotReturn) newFunction->setDoesNotReturn(); diff --git a/llvm/test/Transforms/HotColdSplit/unwind.ll b/llvm/test/Transforms/HotColdSplit/unwind.ll new file mode 100644 index 00000000000..4715ef2ab86 --- /dev/null +++ b/llvm/test/Transforms/HotColdSplit/unwind.ll @@ -0,0 +1,37 @@ +; RUN: opt -hotcoldsplit -S < %s | FileCheck %s + +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.14.0" + +; Do not mark outlined functions which resume exception unwinding as noreturn. + +; CHECK-LABEL: define {{.*}}@foo.cold.1( +; CHECK: resume +; CHECK-NOT: noreturn +define i32 @foo(i32 %cond) personality i8 0 { +entry: + invoke void @llvm.donothing() to label %normal unwind label %exception + +exception: + %cleanup = landingpad i32 cleanup + br i1 undef, label %normal, label %continue_exception + +continue_exception: + call void @sideeffect(i32 0) + call void @sideeffect(i32 1) + call void @sink() + resume i32 undef + +normal: + br i1 undef, label %continue_exception, label %exit + +exit: + call void @sideeffect(i32 2) + ret i32 0 +} + +declare void @sideeffect(i32) + +declare void @sink() cold + +declare void @llvm.donothing() nounwind readnone |
