Skip to content

Commit 9570ff9

Browse files
igor-laevskyigor-laevsky
committedFeb 19, 2015
Implement invoke statepoint verification.
Differential Revision: http://reviews.llvm.org/D7366 llvm-svn: 229840
·
llvmorg-21-initllvmorg-3.7.0-rc1
1 parent bc5986f commit 9570ff9

File tree

2 files changed

+81
-11
lines changed

2 files changed

+81
-11
lines changed
 

‎llvm/lib/IR/Verifier.cpp

+49-9
Original file line numberDiff line numberDiff line change
@@ -1987,6 +1987,13 @@ void Verifier::visitInvokeInst(InvokeInst &II) {
19871987
Assert1(II.getUnwindDest()->isLandingPad(),
19881988
"The unwind destination does not have a landingpad instruction!",&II);
19891989

1990+
if (Function *F = II.getCalledFunction())
1991+
// TODO: Ideally we should use visitIntrinsicFunction here. But it uses
1992+
// CallInst as an input parameter. It not woth updating this whole
1993+
// function only to support statepoint verification.
1994+
if (F->getIntrinsicID() == Intrinsic::experimental_gc_statepoint)
1995+
VerifyStatepoint(ImmutableCallSite(&II));
1996+
19901997
visitTerminatorInst(II);
19911998
}
19921999

@@ -2486,7 +2493,8 @@ void Verifier::visitInstruction(Instruction &I) {
24862493
Assert1(!F->isIntrinsic() || isa<CallInst>(I) ||
24872494
F->getIntrinsicID() == Intrinsic::donothing ||
24882495
F->getIntrinsicID() == Intrinsic::experimental_patchpoint_void ||
2489-
F->getIntrinsicID() == Intrinsic::experimental_patchpoint_i64,
2496+
F->getIntrinsicID() == Intrinsic::experimental_patchpoint_i64 ||
2497+
F->getIntrinsicID() == Intrinsic::experimental_gc_statepoint,
24902498
"Cannot invoke an intrinsinc other than"
24912499
" donothing or patchpoint", &I);
24922500
Assert1(F->getParent() == M, "Referencing function in another module!",
@@ -2901,14 +2909,46 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
29012909
break;
29022910
}
29032911
case Intrinsic::experimental_gc_relocate: {
2904-
// Are we tied to a statepoint properly?
2905-
CallSite StatepointCS(CI.getArgOperand(0));
2906-
const Function *StatepointFn =
2907-
StatepointCS.getInstruction() ? StatepointCS.getCalledFunction() : nullptr;
2908-
Assert2(StatepointFn && StatepointFn->isDeclaration() &&
2909-
StatepointFn->getIntrinsicID() == Intrinsic::experimental_gc_statepoint,
2910-
"gc.relocate operand #1 must be from a statepoint",
2911-
&CI, CI.getArgOperand(0));
2912+
Assert1(CI.getNumArgOperands() == 3, "wrong number of arguments", &CI);
2913+
2914+
// Check that this relocate is correctly tied to the statepoint
2915+
2916+
// This is case for relocate on the unwinding path of an invoke statepoint
2917+
if (ExtractValueInst *ExtractValue =
2918+
dyn_cast<ExtractValueInst>(CI.getArgOperand(0))) {
2919+
Assert1(isa<LandingPadInst>(ExtractValue->getAggregateOperand()),
2920+
"gc relocate on unwind path incorrectly linked to the statepoint",
2921+
&CI);
2922+
2923+
const BasicBlock *invokeBB =
2924+
ExtractValue->getParent()->getUniquePredecessor();
2925+
2926+
// Landingpad relocates should have only one predecessor with invoke
2927+
// statepoint terminator
2928+
Assert1(invokeBB,
2929+
"safepoints should have unique landingpads",
2930+
ExtractValue->getParent());
2931+
Assert1(invokeBB->getTerminator(),
2932+
"safepoint block should be well formed",
2933+
invokeBB);
2934+
Assert1(isStatepoint(invokeBB->getTerminator()),
2935+
"gc relocate should be linked to a statepoint",
2936+
invokeBB);
2937+
}
2938+
else {
2939+
// In all other cases relocate should be tied to the statepoint directly.
2940+
// This covers relocates on a normal return path of invoke statepoint and
2941+
// relocates of a call statepoint
2942+
auto Token = CI.getArgOperand(0);
2943+
Assert2(isa<Instruction>(Token) && isStatepoint(cast<Instruction>(Token)),
2944+
"gc relocate is incorrectly tied to the statepoint",
2945+
&CI, Token);
2946+
}
2947+
2948+
// Verify rest of the relocate arguments
2949+
2950+
GCRelocateOperands ops(&CI);
2951+
ImmutableCallSite StatepointCS(ops.statepoint());
29122952

29132953
// Both the base and derived must be piped through the safepoint
29142954
Value* Base = CI.getArgOperand(1);

‎llvm/test/Verifier/statepoint.ll

+32-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ declare i32 @llvm.experimental.gc.statepoint.p0f_isVoidf(void ()*, i32, i32, ...
77
declare i32 @"personality_function"()
88

99
;; Basic usage
10-
define i64 addrspace(1)* @test1(i8 addrspace(1)* %arg) {
10+
define i64 addrspace(1)* @test1(i8 addrspace(1)* %arg) gc "statepoint-example" {
1111
entry:
1212
%cast = bitcast i8 addrspace(1)* %arg to i64 addrspace(1)*
1313
%safepoint_token = call i32 (void ()*, i32, i32, ...)* @llvm.experimental.gc.statepoint.p0f_isVoidf(void ()* undef, i32 0, i32 0, i32 5, i32 0, i32 0, i32 0, i32 10, i32 0, i8 addrspace(1)* %arg, i64 addrspace(1)* %cast, i8 addrspace(1)* %arg, i8 addrspace(1)* %arg)
@@ -29,7 +29,7 @@ entry:
2929
; 2) A value can be replaced by one which is known equal. This
3030
; means a potentially derived pointer can be known base and that
3131
; we can't check that derived pointer are never bases.
32-
define void @test2(i8 addrspace(1)* %arg, i64 addrspace(1)* %arg2) {
32+
define void @test2(i8 addrspace(1)* %arg, i64 addrspace(1)* %arg2) gc "statepoint-example" {
3333
entry:
3434
%cast = bitcast i8 addrspace(1)* %arg to i64 addrspace(1)*
3535
%c = icmp eq i64 addrspace(1)* %cast, %arg2
@@ -51,3 +51,33 @@ equal:
5151
; CHECK-NEXT: ret voi
5252
}
5353

54+
; Basic test for invoke statepoints
55+
define i8 addrspace(1)* @test3(i8 addrspace(1)* %obj, i8 addrspace(1)* %obj1) gc "statepoint-example" {
56+
; CHECK-LABEL: test3
57+
entry:
58+
; CHECK-LABEL: entry
59+
; CHECK: statepoint
60+
%0 = invoke i32 (void ()*, i32, i32, ...)* @llvm.experimental.gc.statepoint.p0f_isVoidf(void ()* undef, i32 0, i32 0, i32 5, i32 0, i32 -1, i32 0, i32 0, i32 0, i8 addrspace(1)* %obj, i8 addrspace(1)* %obj1)
61+
to label %normal_dest unwind label %exceptional_return
62+
63+
normal_dest:
64+
; CHECK-LABEL: normal_dest:
65+
; CHECK: gc.relocate
66+
; CHECK: gc.relocate
67+
; CHECK: ret
68+
%obj.relocated = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(i32 %0, i32 9, i32 9)
69+
%obj1.relocated = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(i32 %0, i32 10, i32 10)
70+
ret i8 addrspace(1)* %obj.relocated
71+
72+
exceptional_return:
73+
; CHECK-LABEL: exceptional_return
74+
; CHECK: gc.relocate
75+
; CHECK: gc.relocate
76+
%landing_pad = landingpad { i8*, i32 } personality i32 ()* @"personality_function"
77+
cleanup
78+
%relocate_token = extractvalue { i8*, i32 } %landing_pad, 1
79+
%obj.relocated1 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(i32 %relocate_token, i32 9, i32 9)
80+
%obj1.relocated1 = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(i32 %relocate_token, i32 10, i32 10)
81+
ret i8 addrspace(1)* %obj1.relocated1
82+
}
83+

0 commit comments

Comments
 (0)
Please sign in to comment.