diff options
| -rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 3 | ||||
| -rw-r--r-- | test/Transforms/Inline/inline_invoke_with_asm_call.ll | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 585658a881..56429117f7 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -193,7 +193,8 @@ static bool HandleCallsInBlockInlinedThroughInvoke(BasicBlock *BB, CallInst *CI = dyn_cast<CallInst>(I); // If this call cannot unwind, don't convert it to an invoke. - if (!CI || CI->doesNotThrow()) + // Inline asm calls cannot throw. + if (!CI || CI->doesNotThrow() || isa<InlineAsm>(CI->getCalledValue())) continue; // Convert this function call into an invoke instruction. First, split the diff --git a/test/Transforms/Inline/inline_invoke_with_asm_call.ll b/test/Transforms/Inline/inline_invoke_with_asm_call.ll new file mode 100644 index 0000000000..c1fb57d26b --- /dev/null +++ b/test/Transforms/Inline/inline_invoke_with_asm_call.ll @@ -0,0 +1,30 @@ +; RUN: opt < %s -inline -S | FileCheck %s +target triple = "x86_64-apple-darwin" + +; rdar://15317907 +; CHECK-LABEL: @caller +; Make sure we are generating "call asm" instead of "invoke asm". +; CHECK: call void asm +; CHECK-LABEL: @callee_with_asm +define void @caller() { + br i1 undef, label %1, label %4 + +; <label>:1 + invoke void @callee_with_asm() + to label %4 unwind label %2 + +; <label>:2 + %3 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__objc_personality_v0 to i8*) + cleanup + resume { i8*, i32 } undef + +; <label>:4 + ret void +} + +define void @callee_with_asm() { + call void asm sideeffect "mov\09r7, r7\09\09@ marker for objc_retainAutoreleaseReturnValue", ""() + ret void +} + +declare i32 @__objc_personality_v0(...) |