diff options
| -rw-r--r-- | llvm/include/llvm/CodeGen/GCStrategy.h | 1 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/GCMetadata.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/GCRootLowering.cpp | 9 |
3 files changed, 2 insertions, 10 deletions
diff --git a/llvm/include/llvm/CodeGen/GCStrategy.h b/llvm/include/llvm/CodeGen/GCStrategy.h index b24a9bad3fd..ab0366bebbc 100644 --- a/llvm/include/llvm/CodeGen/GCStrategy.h +++ b/llvm/include/llvm/CodeGen/GCStrategy.h @@ -66,7 +66,6 @@ namespace GC { /// most runtimes, PostCall safepoints are appropriate. /// enum PointKind { - PreCall, ///< Instr is a call instruction. PostCall ///< Instr is the return address of a call. }; diff --git a/llvm/lib/CodeGen/GCMetadata.cpp b/llvm/lib/CodeGen/GCMetadata.cpp index fe3d2965794..4bf5335f9d7 100644 --- a/llvm/lib/CodeGen/GCMetadata.cpp +++ b/llvm/lib/CodeGen/GCMetadata.cpp @@ -105,8 +105,6 @@ void Printer::getAnalysisUsage(AnalysisUsage &AU) const { static const char *DescKind(GC::PointKind Kind) { switch (Kind) { - case GC::PreCall: - return "pre-call"; case GC::PostCall: return "post-call"; } diff --git a/llvm/lib/CodeGen/GCRootLowering.cpp b/llvm/lib/CodeGen/GCRootLowering.cpp index 8f9df36d84b..fff76f540f5 100644 --- a/llvm/lib/CodeGen/GCRootLowering.cpp +++ b/llvm/lib/CodeGen/GCRootLowering.cpp @@ -263,16 +263,11 @@ MCSymbol *GCMachineCodeAnalysis::InsertLabel(MachineBasicBlock &MBB, } void GCMachineCodeAnalysis::VisitCallPoint(MachineBasicBlock::iterator CI) { - // Find the return address (next instruction), too, so as to bracket the call - // instruction. + // Find the return address (next instruction), since that's what will be on + // the stack when the call is suspended and we need to inspect the stack. MachineBasicBlock::iterator RAI = CI; ++RAI; - if (FI->getStrategy().needsSafePoint(GC::PreCall)) { - MCSymbol *Label = InsertLabel(*CI->getParent(), CI, CI->getDebugLoc()); - FI->addSafePoint(GC::PreCall, Label, CI->getDebugLoc()); - } - if (FI->getStrategy().needsSafePoint(GC::PostCall)) { MCSymbol *Label = InsertLabel(*CI->getParent(), RAI, CI->getDebugLoc()); FI->addSafePoint(GC::PostCall, Label, CI->getDebugLoc()); |
