[llvm-commits] [llvm] r42051 - in /llvm/trunk: lib/VMCore/Verifier.cpp test/CodeGen/Generic/GC/lower_gcroot.ll test/Verifier/gcread-ptrptr.ll test/Verifier/gcroot-alloca.ll test/Verifier/gcroot-meta.ll test/Verifier/gcroot-ptrptr.ll test/Verifier/gcwrite-ptrptr.ll
Gordon Henriksen
gordonhenriksen at mac.com
Mon Sep 17 13:30:04 PDT 2007
Author: gordon
Date: Mon Sep 17 15:30:04 2007
New Revision: 42051
URL: http://llvm.org/viewvc/llvm-project?rev=42051&view=rev
Log:
Fix for PR1633: Verifier doesn't fully verify GC intrinsics
LLVM now enforces the following prototypes for the write barriers:
<ty>* @llvm.gcread(<ty2>*, <ty>**)
void @llvm.gcwrite(<ty>*, <ty2>*, <ty>**)
And for @llvm.gcroot, the first stack slot is verified to be an alloca or a
bitcast of an alloca.
Fixes test/CodeGen/Generic/GC/lower_gcroot.ll, which violated these.
Added:
llvm/trunk/test/Verifier/gcread-ptrptr.ll
llvm/trunk/test/Verifier/gcroot-alloca.ll
llvm/trunk/test/Verifier/gcroot-meta.ll
llvm/trunk/test/Verifier/gcroot-ptrptr.ll
llvm/trunk/test/Verifier/gcwrite-ptrptr.ll
Modified:
llvm/trunk/lib/VMCore/Verifier.cpp
llvm/trunk/test/CodeGen/Generic/GC/lower_gcroot.ll
Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=42051&r1=42050&r2=42051&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Mon Sep 17 15:30:04 2007
@@ -1072,6 +1072,18 @@
InstsInThisBlock.insert(&I);
}
+static bool HasPtrPtrType(Value *Val) {
+ if (const PointerType *PtrTy = dyn_cast<PointerType>(Val->getType()))
+ return isa<PointerType>(PtrTy->getElementType());
+ return false;
+}
+
+static Value *StripBitCasts(Value *Val) {
+ if (BitCastInst *CI = dyn_cast<BitCastInst>(Val))
+ return StripBitCasts(CI->getOperand(0));
+ return Val;
+}
+
/// visitIntrinsicFunction - Allow intrinsics to be verified in different ways.
///
void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
@@ -1082,6 +1094,30 @@
#define GET_INTRINSIC_VERIFIER
#include "llvm/Intrinsics.gen"
#undef GET_INTRINSIC_VERIFIER
+
+ switch (ID) {
+ default:
+ break;
+ case Intrinsic::gcroot:
+ Assert1(HasPtrPtrType(CI.getOperand(1)),
+ "llvm.gcroot parameter #1 must be a pointer to a pointer.", &CI);
+ Assert1(isa<AllocaInst>(StripBitCasts(CI.getOperand(1))),
+ "llvm.gcroot parameter #1 must be an alloca (or a bitcast).", &CI);
+ Assert1(isa<Constant>(CI.getOperand(2)),
+ "llvm.gcroot parameter #2 must be a constant or global.", &CI);
+ break;
+ case Intrinsic::gcwrite:
+ Assert1(CI.getOperand(3)->getType()
+ == PointerType::get(CI.getOperand(1)->getType()),
+ "Call to llvm.gcwrite must be with type 'void (%ty*, %ty2*, %ty**)'.",
+ &CI);
+ break;
+ case Intrinsic::gcread:
+ Assert1(CI.getOperand(2)->getType() == PointerType::get(CI.getType()),
+ "Call to llvm.gcread must be with type '%ty* (%ty2*, %ty**).'",
+ &CI);
+ break;
+ }
}
/// VerifyIntrinsicPrototype - TableGen emits calls to this function into
Modified: llvm/trunk/test/CodeGen/Generic/GC/lower_gcroot.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/GC/lower_gcroot.ll?rev=42051&r1=42050&r2=42051&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Generic/GC/lower_gcroot.ll (original)
+++ llvm/trunk/test/CodeGen/Generic/GC/lower_gcroot.ll Mon Sep 17 15:30:04 2007
@@ -3,7 +3,8 @@
%Env = type opaque*
define void @.main(%Env) {
- call void @llvm.gcroot( %Env* null, %Env null )
+ %Root = alloca %Env
+ call void @llvm.gcroot( %Env* %Root, %Env null )
unreachable
}
Added: llvm/trunk/test/Verifier/gcread-ptrptr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/gcread-ptrptr.ll?rev=42051&view=auto
==============================================================================
--- llvm/trunk/test/Verifier/gcread-ptrptr.ll (added)
+++ llvm/trunk/test/Verifier/gcread-ptrptr.ll Mon Sep 17 15:30:04 2007
@@ -0,0 +1,13 @@
+; RUN: not llvm-as < %s
+; PR1633
+
+%meta = type { i8* }
+%obj = type { %meta* }
+
+declare %obj* @llvm.gcread(%obj*, %obj*)
+
+define %obj* @f() {
+entry:
+ %x = call %obj* @llvm.gcread(%obj* null, %obj* null)
+ ret %obj* %x
+}
Added: llvm/trunk/test/Verifier/gcroot-alloca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/gcroot-alloca.ll?rev=42051&view=auto
==============================================================================
--- llvm/trunk/test/Verifier/gcroot-alloca.ll (added)
+++ llvm/trunk/test/Verifier/gcroot-alloca.ll Mon Sep 17 15:30:04 2007
@@ -0,0 +1,14 @@
+; RUN: not llvm-as < %s
+; PR1633
+
+%meta = type { i8* }
+%obj = type { %meta* }
+
+declare void @llvm.gcroot(%obj**, %meta*)
+
+define void @f() {
+entry:
+ call void @llvm.gcroot(%obj** null, %meta* null)
+
+ ret void
+}
Added: llvm/trunk/test/Verifier/gcroot-meta.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/gcroot-meta.ll?rev=42051&view=auto
==============================================================================
--- llvm/trunk/test/Verifier/gcroot-meta.ll (added)
+++ llvm/trunk/test/Verifier/gcroot-meta.ll Mon Sep 17 15:30:04 2007
@@ -0,0 +1,16 @@
+; RUN: not llvm-as < %s
+; PR1633
+
+%meta = type { i8* }
+%obj = type { %meta* }
+
+declare void @llvm.gcroot(%obj**, %meta*)
+
+define void @f() {
+entry:
+ %local.obj = alloca %obj*
+ %local.meta = alloca %meta
+ call void @llvm.gcroot(%obj** %local.obj, %meta* %local.meta)
+
+ ret void
+}
Added: llvm/trunk/test/Verifier/gcroot-ptrptr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/gcroot-ptrptr.ll?rev=42051&view=auto
==============================================================================
--- llvm/trunk/test/Verifier/gcroot-ptrptr.ll (added)
+++ llvm/trunk/test/Verifier/gcroot-ptrptr.ll Mon Sep 17 15:30:04 2007
@@ -0,0 +1,14 @@
+; RUN: not llvm-as < %s
+; PR1633
+
+%meta = type { i8* }
+%obj = type { %meta* }
+
+declare void @llvm.gcroot(%obj*, %meta*)
+
+define void @f() {
+entry:
+ %local.obj = alloca %obj
+ call void @llvm.gcroot(%obj* %local.obj, %meta* null)
+ ret void
+}
Added: llvm/trunk/test/Verifier/gcwrite-ptrptr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/gcwrite-ptrptr.ll?rev=42051&view=auto
==============================================================================
--- llvm/trunk/test/Verifier/gcwrite-ptrptr.ll (added)
+++ llvm/trunk/test/Verifier/gcwrite-ptrptr.ll Mon Sep 17 15:30:04 2007
@@ -0,0 +1,13 @@
+; RUN: not llvm-as < %s
+; PR1633
+
+%meta = type { i8* }
+%obj = type { %meta* }
+
+declare void @llvm.gcwrite(%obj*, %obj*, %obj*)
+
+define void @f() {
+entry:
+ call void @llvm.gcwrite(%obj* null, %obj* null, %obj* null)
+ ret void
+}
More information about the llvm-commits
mailing list