summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Transforms
diff options
context:
space:
mode:
authorDuncan Sands <baldrick@free.fr>2007-12-16 21:01:21 +0000
committerDuncan Sands <baldrick@free.fr>2007-12-16 21:01:21 +0000
commit56ed48036bc1c86066e1a44cd18bdcf76a551a0c (patch)
tree76d8e7122e0df527148b9c85f725d04bde42aa42 /llvm/lib/Transforms
parent2af27c202c7209d2e51512b5943dc7686487a568 (diff)
downloadbcm5719-llvm-56ed48036bc1c86066e1a44cd18bdcf76a551a0c.tar.gz
bcm5719-llvm-56ed48036bc1c86066e1a44cd18bdcf76a551a0c.zip
Revert this part of r45073 until the verifier is
changed not to reject invoke of inline asm. llvm-svn: 45077
Diffstat (limited to 'llvm/lib/Transforms')
-rw-r--r--llvm/lib/Transforms/Utils/InlineFunction.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp
index 3d31f71300a..e9f6b28e98b 100644
--- a/llvm/lib/Transforms/Utils/InlineFunction.cpp
+++ b/llvm/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.
OpenPOWER on IntegriCloud