commit 343c88cdb93ffdc3dc44473cb632b2447fa6517f
author Chris Lattner <sabre@nondot.org> Sun Apr 15 21:38:06 2007 +0000
committer Chris Lattner <sabre@nondot.org> Sun Apr 15 21:38:06 2007 +0000
tree 44a8849927b72e85723063a6be2b12ffbaa2529e
parent d3fd9ecb2d3a1eeb1f7268afa115c483806ed576

Fix PR1335 and Transforms/Inline/2007-04-15-InlineEH.ll

llvm-svn: 36090

llvm/lib/Transforms/Utils/InlineFunction.cpp

diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp
index a1a638b..9735a2f 100644
--- a/llvm/lib/Transforms/Utils/InlineFunction.cpp
+++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp
@@ -69,10 +69,11 @@
           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.