aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Henriksen <gordonhenriksen@mac.com>2008-10-25 16:28:35 +0000
committerGordon Henriksen <gordonhenriksen@mac.com>2008-10-25 16:28:35 +0000
commit8314ed9ffd0a2da78c49d2b0d8e24db012bc9388 (patch)
treeff481b11df095c084e91d10eee42b9d0ed4079f3
parent46fa1534a3da7d34970e9f0082d072b4123c6796 (diff)
downloadexternal_llvm-8314ed9ffd0a2da78c49d2b0d8e24db012bc9388.zip
external_llvm-8314ed9ffd0a2da78c49d2b0d8e24db012bc9388.tar.gz
external_llvm-8314ed9ffd0a2da78c49d2b0d8e24db012bc9388.tar.bz2
Related to PR2911, reject as invalid non-pointer GC roots.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58143 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/VMCore/Verifier.cpp6
-rw-r--r--test/CodeGen/Generic/GC/fat.ll10
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index 3ca9d8c8..f8dd24c 100644
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -1347,8 +1347,10 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
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);
}
diff --git a/test/CodeGen/Generic/GC/fat.ll b/test/CodeGen/Generic/GC/fat.ll
new file mode 100644
index 0000000..d05ca3d
--- /dev/null
+++ b/test/CodeGen/Generic/GC/fat.ll
@@ -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
+}