Revert "Don't insert lifetime.end markers between a musttail call and ret"
This reverts commit r208912.
It was committed accidentally without review.
llvm-svn: 208914
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp
index e01d0c3..ab60a40 100644
--- a/llvm/lib/Transforms/Utils/InlineFunction.cpp
+++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp
@@ -755,13 +755,8 @@
}
builder.CreateLifetimeStart(AI, AllocaSize);
- for (ReturnInst *RI : Returns) {
- // Don't insert llvm.lifetime.end calls between a musttail call and a
- // return. The return kills all local allocas.
- if (InlinedMustTailCalls && getPrecedingMustTailCall(RI))
- continue;
+ for (ReturnInst *RI : Returns)
IRBuilder<>(RI).CreateLifetimeEnd(AI, AllocaSize);
- }
}
}
@@ -779,13 +774,8 @@
// Insert a call to llvm.stackrestore before any return instructions in the
// inlined function.
- for (ReturnInst *RI : Returns) {
- // Don't insert llvm.stackrestore calls between a musttail call and a
- // return. The return will restore the stack pointer.
- if (InlinedMustTailCalls && getPrecedingMustTailCall(RI))
- continue;
+ for (ReturnInst *RI : Returns)
IRBuilder<>(RI).CreateCall(StackRestore, SavedPtr);
- }
}
// If we are inlining for an invoke instruction, we must make sure to rewrite