diff options
| -rw-r--r-- | llvm/include/llvm/IR/Statepoint.h | 7 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/llvm/include/llvm/IR/Statepoint.h b/llvm/include/llvm/IR/Statepoint.h index 623a5a6100c..8159cde3425 100644 --- a/llvm/include/llvm/IR/Statepoint.h +++ b/llvm/include/llvm/IR/Statepoint.h @@ -198,7 +198,7 @@ public: /// May contain several relocations for the same base/derived pair. /// For example this could happen due to relocations on unwinding /// path of invoke. - std::vector<GCRelocateOperands> getRelocates(ImmutableStatepoint &IS); + std::vector<GCRelocateOperands> getRelocates(); #ifndef NDEBUG /// Asserts if this statepoint is malformed. Common cases for failure @@ -315,12 +315,11 @@ public: template <typename InstructionTy, typename ValueTy, typename CallSiteTy> std::vector<GCRelocateOperands> -StatepointBase<InstructionTy, ValueTy, CallSiteTy>::getRelocates( - ImmutableStatepoint &IS) { +StatepointBase<InstructionTy, ValueTy, CallSiteTy>::getRelocates() { std::vector<GCRelocateOperands> Result; - ImmutableCallSite StatepointCS = IS.getCallSite(); + CallSiteTy StatepointCS = getCallSite(); // Search for relocated pointers. Note that working backwards from the // gc_relocates ensures that we only get pairs which are actually relocated diff --git a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp index 914ff405c4c..a6b3fc6c4d4 100644 --- a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp @@ -372,8 +372,7 @@ static void getIncomingStatepointGCValues( SmallVectorImpl<const Value *> &Bases, SmallVectorImpl<const Value *> &Ptrs, SmallVectorImpl<const Value *> &Relocs, ImmutableStatepoint StatepointSite, SelectionDAGBuilder &Builder) { - for (GCRelocateOperands relocateOpers : - StatepointSite.getRelocates(StatepointSite)) { + for (GCRelocateOperands relocateOpers : StatepointSite.getRelocates()) { Relocs.push_back(relocateOpers.getUnderlyingCallSite().getInstruction()); Bases.push_back(relocateOpers.getBasePtr()); Ptrs.push_back(relocateOpers.getDerivedPtr()); @@ -573,8 +572,7 @@ static void lowerStatepointMetaArgs(SmallVectorImpl<SDValue> &Ops, FunctionLoweringInfo::StatepointSpilledValueMapTy &SpillMap = Builder.FuncInfo.StatepointRelocatedValues[StatepointInstr]; - for (GCRelocateOperands RelocateOpers : - StatepointSite.getRelocates(StatepointSite)) { + for (GCRelocateOperands RelocateOpers : StatepointSite.getRelocates()) { const Value *V = RelocateOpers.getDerivedPtr(); SDValue SDV = Builder.getValue(V); SDValue Loc = Builder.StatepointLowering.getLocation(SDV); |
