From 881547e01baf0d4c3454b024c4fa908138cb052d Mon Sep 17 00:00:00 2001 From: Chen Li Date: Mon, 18 May 2015 19:50:14 +0000 Subject: [PATCH] [Verifier] Assert gc_relocate always return a pointer type Summary: Add an assertion in verifier.cpp to make sure gc_relocate relocate a gc pointer, and its return type has the same address space with the relocated pointer. Reviewers: reames, AndyAyers, sanjoy, pgavlin Reviewed By: pgavlin Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D9695 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237605 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Verifier.cpp | 14 ++++++++++++-- test/Verifier/gc_relocate_addrspace.ll | 23 +++++++++++++++++++++++ test/Verifier/gc_relocate_operand.ll | 21 +++++++++++++++++++++ test/Verifier/gc_relocate_return.ll | 22 ++++++++++++++++++++++ 4 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 test/Verifier/gc_relocate_addrspace.ll create mode 100644 test/Verifier/gc_relocate_operand.ll create mode 100644 test/Verifier/gc_relocate_return.ll diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp index f4bc289cf26..5dae4e08ced 100644 --- a/lib/IR/Verifier.cpp +++ b/lib/IR/Verifier.cpp @@ -3440,8 +3440,18 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) { "'gc parameters' section of the statepoint call", &CI); - // gc_relocate does not need to be the same type as the relocated pointer. - // It can casted to the correct type later if it's desired + // Relocated value must be a pointer type, but gc_relocate does not need to return the + // same pointer type as the relocated pointer. It can be casted to the correct type later + // if it's desired. However, they must have the same address space. + GCRelocateOperands Operands(&CI); + Assert(Operands.getDerivedPtr()->getType()->isPointerTy(), + "gc.relocate: relocated value must be a gc pointer", &CI); + + // gc_relocate return type must be a pointer type, and is verified earlier in + // VerifyIntrinsicType(). + Assert(cast(CI.getType())->getAddressSpace() == + cast(Operands.getDerivedPtr()->getType())->getAddressSpace(), + "gc.relocate: relocating a pointer shouldn't change its address space", &CI); break; } }; diff --git a/test/Verifier/gc_relocate_addrspace.ll b/test/Verifier/gc_relocate_addrspace.ll new file mode 100644 index 00000000000..ddc1b230a8c --- /dev/null +++ b/test/Verifier/gc_relocate_addrspace.ll @@ -0,0 +1,23 @@ +; RUN: not llvm-as -disable-output <%s 2>&1 | FileCheck %s +; This is to verify that gc_relocate must return a pointer with the same +; address space with the relocated value. + +; CHECK: gc.relocate: relocating a pointer shouldn't change its address space +; CHECK-NEXT: %obj.relocated = call coldcc i8* @llvm.experimental.gc.relocate.p0i8(i32 %safepoint_token, i32 7, i32 7) ; + +declare void @foo() + +; Function Attrs: nounwind +declare i32 @llvm.experimental.gc.statepoint.p0f_isVoidf(i64, i32, void ()*, i32, i32, ...) #0 + +define void @test1(i64 addrspace(1)* %obj) gc "statepoint-example" { +entry: + %safepoint_token = call i32 (i64, i32, void ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 0, i32 0, void ()* @foo, i32 0, i32 0, i32 0, i32 0, i64 addrspace(1)* %obj) + %obj.relocated = call coldcc i8* @llvm.experimental.gc.relocate.p0i8(i32 %safepoint_token, i32 7, i32 7) ; (%obj, %obj) + ret void +} + +; Function Attrs: nounwind +declare i8* @llvm.experimental.gc.relocate.p0i8(i32, i32, i32) #0 + +attributes #0 = { nounwind } diff --git a/test/Verifier/gc_relocate_operand.ll b/test/Verifier/gc_relocate_operand.ll new file mode 100644 index 00000000000..c28b8d87036 --- /dev/null +++ b/test/Verifier/gc_relocate_operand.ll @@ -0,0 +1,21 @@ +; RUN: not llvm-as -disable-output <%s 2>&1 | FileCheck %s +; This is to verify that the relocated value by gc_relocate must be a pointer type. + +; CHECK: gc.relocate: relocated value must be a gc pointer + +declare void @foo() + +declare i32 @llvm.experimental.gc.statepoint.p0f_isVoidf(i64, i32, void ()*, i32, i32, ...) + +define void @test1(i64 %obj) gc "statepoint-example" { +entry: + %safepoint_token = call i32 (i64, i32, void ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 0, i32 0, void ()* @foo, i32 0, i32 0, i32 0, i32 0, i64 %obj) + %obj.relocated = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(i32 %safepoint_token, i32 7, i32 7) ; (%obj, %obj) + ret void +} + +; Function Attrs: nounwind +declare i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(i32, i32, i32) #0 + +attributes #0 = { nounwind } + diff --git a/test/Verifier/gc_relocate_return.ll b/test/Verifier/gc_relocate_return.ll new file mode 100644 index 00000000000..3957d4c0cec --- /dev/null +++ b/test/Verifier/gc_relocate_return.ll @@ -0,0 +1,22 @@ +; RUN: not llvm-as -disable-output <%s 2>&1 | FileCheck %s +; This is to verify that gc_relocate must return a pointer type, which is defined +; in intrinsics.td. + +; CHECK: Intrinsic has incorrect return type! + +declare void @foo() + +declare i32 @llvm.experimental.gc.statepoint.p0f_isVoidf(i64, i32, void ()*, i32, i32, ...) + +define void @test1(<2 x i32 addrspace(1)*> addrspace(1)* %obj) gc "statepoint-example" { +entry: + %safepoint_token = call i32 (i64, i32, void ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 0, i32 0, void ()* @foo, i32 0, i32 0, i32 0, i32 0, <2 x i32 addrspace(1)*> addrspace(1)* %obj) + %obj.relocated = call coldcc i8 @llvm.experimental.gc.relocate.i8(i32 %safepoint_token, i32 7, i32 7) ; (%obj, %obj) + ret void +} + +; Function Attrs: nounwind +declare i8 @llvm.experimental.gc.relocate.i8(i32, i32, i32) #0 + +attributes #0 = { nounwind } + -- 2.40.0