diff options
| author | Tanya Lattner <tonic@nondot.org> | 2009-02-14 01:04:03 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2009-02-14 01:04:03 +0000 |
| commit | 3400fc0434bc7651d205f83bc8d71b943f1059b5 (patch) | |
| tree | 54aa34363b6e2fe666075bb669def8672996472d /lib/Transforms/Utils/InlineFunction.cpp | |
| parent | 6a64c0bc1e7ac9459f769d1cca79bb13ab2fb452 (diff) | |
Merge 64364 from mainline.
Fix a nasty bug (PR3550) where the inline pass could incorrectly mark
calls with the tail marker when inlining them through an invoke. Patch,
testcase, and perfect analysis by Jay Foad!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_25@64520 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils/InlineFunction.cpp')
| -rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 758b97ea91..a96c7ceaa8 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -203,10 +203,10 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { CalledFunc->getFunctionType()->isVarArg()) return false; - // If the call to the callee is a non-tail call, we must clear the 'tail' + // If the call to the callee is not a tail call, we must clear the 'tail' // flags on any calls that we inline. bool MustClearTailCallFlags = - isa<CallInst>(TheCall) && !cast<CallInst>(TheCall)->isTailCall(); + !(isa<CallInst>(TheCall) && cast<CallInst>(TheCall)->isTailCall()); // If the call to the callee cannot throw, set the 'nounwind' flag on any // calls that we inline. |