From: Duncan Sands <baldrick@free.fr>
Date: Sun, 16 Dec 2007 21:01:21 +0000 (+0000)
Subject: Revert this part of r45073 until the verifier is
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=17af3577791f44429bc43c20cd787b960ec5d3b4;p=oota-llvm.git

Revert this part of r45073 until the verifier is
changed not to reject invoke of inline asm.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45077 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp
index 3d31f71300a..e9f6b28e98b 100644
--- a/lib/Transforms/Utils/InlineFunction.cpp
+++ b/lib/Transforms/Utils/InlineFunction.cpp
@@ -69,8 +69,9 @@ static void HandleInlinedInvoke(InvokeInst *II, BasicBlock *FirstNewBlock,
           if (!isa<CallInst>(I)) continue;
           CallInst *CI = cast<CallInst>(I);
 
-          // If this call cannot unwind, don't convert it to an invoke.
-          if (CI->isNoUnwind())
+          // If this call cannot unwind or is an inline asm, don't
+          // convert it to an invoke.
+          if (CI->isNoUnwind() || isa<InlineAsm>(CI->getCalledValue()))
             continue;
 
           // Convert this function call into an invoke instruction.