RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-02-08 03:26:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[StatepointLowering] Schedule gc relocates before uniqueing them

Browse Source 
Otherwise we can see an "unexpected" gc.relocate that we uniqued away.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@264127 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sanjoy Das 2016-03-23 02:24:07 +00:00
parent 835c01151e
commit 5fb8106b47
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
View File

@ -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;

16
lib/CodeGen/SelectionDAG/StatepointLowering.cpp
View File

@ -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);

20
test/CodeGen/X86/statepoint-duplicate-gcrelocate.ll Normal file
View File

@ -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
}