[llvm-commits] [llvm] r58143 - in /llvm/trunk: lib/VMCore/Verifier.cpp test/CodeGen/Generic/GC/fat.ll

[Gordon Henriksen]

Author: gordon
Date: Sat Oct 25 11:28:35 2008
New Revision: 58143

URL: http://llvm.org/viewvc/llvm-project?rev=58143&view=rev
Log:
Related to PR2911, reject as invalid non-pointer GC roots.

Added:
    llvm/trunk/test/CodeGen/Generic/GC/fat.ll
Modified:
    llvm/trunk/lib/VMCore/Verifier.cpp

Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=58143&r1=58142&r2=58143&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Sat Oct 25 11:28:35 2008
@@ -1347,8 +1347,10 @@
   case Intrinsic::gcwrite:
   case Intrinsic::gcread:
     if (ID == Intrinsic::gcroot) {
-      Assert1(isa<AllocaInst>(CI.getOperand(1)->stripPointerCasts()),
-              "llvm.gcroot parameter #1 must be an alloca.", &CI);
+      AllocaInst *AI =
+        dyn_cast<AllocaInst>(CI.getOperand(1)->stripPointerCasts());
+      Assert1(AI && isa<PointerType>(AI->getType()->getElementType()),
+              "llvm.gcroot parameter #1 must be a pointer alloca.", &CI);
       Assert1(isa<Constant>(CI.getOperand(2)),
               "llvm.gcroot parameter #2 must be a constant.", &CI);
     }

Added: llvm/trunk/test/CodeGen/Generic/GC/fat.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/GC/fat.ll?rev=58143&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Generic/GC/fat.ll (added)
+++ llvm/trunk/test/CodeGen/Generic/GC/fat.ll Sat Oct 25 11:28:35 2008
@@ -0,0 +1,10 @@
+; RUN: not llvm-as < %s >& /dev/null
+
+declare void @llvm.gcroot(i8**, i8*) nounwind
+
+define void @f() gc "x" {
+	%st = alloca { i8*, i1 }		; <{ i8*, i1 }*> [#uses=1]
+	%st_ptr = bitcast { i8*, i1 }* %st to i8**		; <i8**> [#uses=1]
+	call void @llvm.gcroot(i8** %st_ptr, i8* null)
+	ret void
+}