From 8e4847ee957a7c7c434a72fdb7a6010004ca86f4 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Sun, 16 Dec 2007 15:51:49 +0000 Subject: Make instcombine promote inline asm calls to 'nounwind' calls. Remove special casing of inline asm from the inliner. There is a potential problem: the verifier rejects invokes of inline asm (not sure why). If an asm call is not marked "nounwind" in some .ll, and instcombine is not run, but the inliner is run, then an illegal module will be created. This is bad but I'm not sure what the best approach is. I'm tempted to remove the check in the verifier... llvm-svn: 45073 --- llvm/lib/Transforms/Scalar/InstructionCombining.cpp | 13 +++++++++++++ llvm/lib/Transforms/Utils/InlineFunction.cpp | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Transforms') diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp index 653d35e34f4..aa9e932fc52 100644 --- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp @@ -7972,6 +7972,19 @@ Instruction *InstCombiner::visitCallSite(CallSite CS) { } } + if (isa(Callee) && !CS.isNoUnwind()) { + // Inline asm calls cannot throw - mark them 'nounwind'. + const ParamAttrsList *PAL = CS.getParamAttrs(); + uint16_t RAttributes = PAL ? PAL->getParamAttrs(0) : 0; + RAttributes |= ParamAttr::NoUnwind; + + ParamAttrsVector modVec; + modVec.push_back(ParamAttrsWithIndex::get(0, RAttributes)); + PAL = ParamAttrsList::getModified(PAL, modVec); + CS.setParamAttrs(PAL); + Changed = true; + } + return Changed ? CS.getInstruction() : 0; } diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp index e9f6b28e98b..3d31f71300a 100644 --- a/llvm/lib/Transforms/Utils/InlineFunction.cpp +++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp @@ -69,9 +69,8 @@ static void HandleInlinedInvoke(InvokeInst *II, BasicBlock *FirstNewBlock, if (!isa(I)) continue; CallInst *CI = cast(I); - // If this call cannot unwind or is an inline asm, don't - // convert it to an invoke. - if (CI->isNoUnwind() || isa(CI->getCalledValue())) + // If this call cannot unwind, don't convert it to an invoke. + if (CI->isNoUnwind()) continue; // Convert this function call into an invoke instruction. -- cgit v1.2.3