diff options
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h | 6 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp | 16 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/statepoint-duplicate-gcrelocate.ll | 20 |
3 files changed, 33 insertions, 9 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h index 5e27a1c7147..c68f363ac60 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h @@ -732,11 +732,11 @@ public: struct StatepointLoweringInfo { /// Bases[i] is the base pointer for Ptrs[i]. Together they denote the set /// of gc pointers this STATEPOINT has to relocate. - ArrayRef<const Value *> Bases; - ArrayRef<const Value *> Ptrs; + SmallVector<const Value *, 16> Bases; + SmallVector<const Value *, 16> Ptrs; /// The set of gc.relocate calls associated with this gc.statepoint. - ArrayRef<const GCRelocateInst *> GCRelocates; + SmallVector<const GCRelocateInst *, 16> GCRelocates; /// The full list of gc arguments to the gc.statepoint being lowered. ArrayRef<const Use> GCArgs; diff --git a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp index ad339064b14..eccebf2b656 100644 --- a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp @@ -334,12 +334,6 @@ static void getIncomingStatepointGCValues( Ptrs.push_back(Relocate->getDerivedPtr()); } - // Remove any redundant llvm::Values which map to the same SDValue as another - // 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(Bases, Ptrs, Relocs, Builder); - assert(Bases.size() == Ptrs.size() && Ptrs.size() == Relocs.size()); } @@ -566,11 +560,21 @@ 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. for (auto *Reloc : SI.GCRelocates) if (Reloc->getParent() == SI.StatepointInstr->getParent()) StatepointLowering.scheduleRelocCall(*Reloc); #endif + // Remove any redundant llvm::Values which map to the same SDValue as another + // 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); + assert(SI.Bases.size() == SI.Ptrs.size() && + SI.Ptrs.size() == SI.GCRelocates.size()); + // Lower statepoint vmstate and gcstate arguments SmallVector<SDValue, 10> LoweredMetaArgs; lowerStatepointMetaArgs(LoweredMetaArgs, SI, *this); diff --git a/llvm/test/CodeGen/X86/statepoint-duplicate-gcrelocate.ll b/llvm/test/CodeGen/X86/statepoint-duplicate-gcrelocate.ll new file mode 100644 index 00000000000..47847aa3033 --- /dev/null +++ b/llvm/test/CodeGen/X86/statepoint-duplicate-gcrelocate.ll @@ -0,0 +1,20 @@ +; RUN: llc < %s | FileCheck %s + +; Checks for a crash we had when two gc.relocate calls would +; relocating identical values + +target datalayout = "e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-pc-linux-gnu" + +declare void @f() +declare token @llvm.experimental.gc.statepoint.p0f_isVoidf(i64, i32, void ()*, i32, i32, ...) +declare i32 addrspace(1)* @llvm.experimental.gc.relocate.p1i32(token, i32, i32) #3 + +define void @test(i32 addrspace(1)* %ptr) gc "statepoint-example" { +; CHECK-LABEL: test + %tok = tail call token (i64, i32, void ()*, i32, i32, ...) + @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 0, i32 0, void ()* @f, i32 0, i32 0, i32 0, i32 2, i32 addrspace(1)* %ptr, i32 undef, i32 addrspace(1)* %ptr, i32 addrspace(1)* %ptr) + %a = call i32 addrspace(1)* @llvm.experimental.gc.relocate.p1i32(token %tok, i32 9, i32 9) + %b = call i32 addrspace(1)* @llvm.experimental.gc.relocate.p1i32(token %tok, i32 10, i32 10) + ret void +} |
