diff options
author | Chris Lattner <sabre@nondot.org> | 2007-04-15 21:38:06 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2007-04-15 21:38:06 +0000 |
commit | a6a996d3190be77bdca3bac85e6924bb86d67484 (patch) | |
tree | 5bb81a3a327292d10005d5bf8a5deb2f03672016 /lib/Transforms | |
parent | 004ca2d5b435eb223e6a8ac31bdd15de8e0946b0 (diff) | |
download | llvm-a6a996d3190be77bdca3bac85e6924bb86d67484.tar.gz llvm-a6a996d3190be77bdca3bac85e6924bb86d67484.tar.bz2 llvm-a6a996d3190be77bdca3bac85e6924bb86d67484.tar.xz |
Fix PR1335 and Transforms/Inline/2007-04-15-InlineEH.ll
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36090 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
-rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index a1a638b0c2..9735a2fcda 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -69,10 +69,11 @@ static void HandleInlinedInvoke(InvokeInst *II, BasicBlock *FirstNewBlock, if (!isa<CallInst>(I)) continue; CallInst *CI = cast<CallInst>(I); - // If this is an intrinsic function call, don't convert it to an - // invoke. - if (CI->getCalledFunction() && - CI->getCalledFunction()->getIntrinsicID()) + // If this is an intrinsic function call or an inline asm, don't + // convert it to an invoke. + if ((CI->getCalledFunction() && + CI->getCalledFunction()->getIntrinsicID()) || + isa<InlineAsm>(CI->getCalledValue())) continue; // Convert this function call into an invoke instruction. |