diff options
| -rw-r--r-- | llvm/include/llvm/CodeGen/FunctionLoweringInfo.h | 11 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp | 14 |
2 files changed, 12 insertions, 13 deletions
diff --git a/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h b/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h index 09a9991912d..e457080a07d 100644 --- a/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h +++ b/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h @@ -80,12 +80,11 @@ public: /// Track virtual registers created for exception pointers. DenseMap<const Value *, unsigned> CatchPadExceptionPointers; - // Keep track of frame indices allocated for statepoints as they could be used - // across basic block boundaries. - // Key of the map is statepoint instruction, value is a map from spilled - // llvm Value to the optional stack stack slot index. - // If optional is unspecified it means that we have visited this value - // but didn't spill it. + /// Keep track of frame indices allocated for statepoints as they could be + /// used across basic block boundaries. Key of the map is statepoint + /// instruction, value is a map from spilled llvm Value to the optional stack + /// stack slot index. If optional is unspecified it means that we have + /// visited this value but didn't spill it. typedef DenseMap<const Value*, Optional<int>> StatepointSpilledValueMapTy; DenseMap<const Instruction*, StatepointSpilledValueMapTy> StatepointRelocatedValues; diff --git a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp index d4da79699a7..56035d4fcfb 100644 --- a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp @@ -246,10 +246,10 @@ static void reservePreviousStackSlotForValue(const Value *IncomingValue, /// StackMap section. It has no effect on the number of spill slots required /// or the actual lowering. static void -removeDuplicatesGCPtrs(SmallVectorImpl<const Value *> &Bases, - SmallVectorImpl<const Value *> &Ptrs, - SmallVectorImpl<const GCRelocateInst *> &Relocs, - SelectionDAGBuilder &Builder) { +removeDuplicateGCPtrs(SmallVectorImpl<const Value *> &Bases, + SmallVectorImpl<const Value *> &Ptrs, + SmallVectorImpl<const GCRelocateInst *> &Relocs, + SelectionDAGBuilder &Builder) { // This is horribly inefficient, but I don't care right now SmallSet<SDValue, 32> Seen; @@ -540,8 +540,8 @@ SDValue SelectionDAGBuilder::LowerAsSTATEPOINT( StatepointLowering.startNewStatepoint(*this); #ifndef NDEBUG - // We schedule gc relocates before removeDuplicatesGCPtrs since we _will_ - // encounter the duplicate gc relocates we elide in removeDuplicatesGCPtrs. + // We schedule gc relocates before removeDuplicateGCPtrs since we _will_ + // encounter the duplicate gc relocates we elide in removeDuplicateGCPtrs. for (auto *Reloc : SI.GCRelocates) if (Reloc->getParent() == SI.StatepointInstr->getParent()) StatepointLowering.scheduleRelocCall(*Reloc); @@ -551,7 +551,7 @@ SDValue SelectionDAGBuilder::LowerAsSTATEPOINT( // input. Also has the effect of removing duplicates in the original // llvm::Value input list as well. This is a useful optimization for // reducing the size of the StackMap section. It has no other impact. - removeDuplicatesGCPtrs(SI.Bases, SI.Ptrs, SI.GCRelocates, *this); + removeDuplicateGCPtrs(SI.Bases, SI.Ptrs, SI.GCRelocates, *this); assert(SI.Bases.size() == SI.Ptrs.size() && SI.Ptrs.size() == SI.GCRelocates.size()); |
