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.

llvm-svn: 42051

6 files changed, 72 insertions, 1 deletions

diff --git a/llvm/test/CodeGen/Generic/GC/lower_gcroot.ll b/llvm/test/CodeGen/Generic/GC/lower_gcroot.ll
index 3a3abac2585..2dbbc83569f 100644
--- a/llvm/test/CodeGen/Generic/GC/lower_gcroot.ll
+++ b/llvm/test/CodeGen/Generic/GC/lower_gcroot.ll
@@ -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
 }
 
diff --git a/llvm/test/Verifier/gcread-ptrptr.ll b/llvm/test/Verifier/gcread-ptrptr.ll
new file mode 100644
index 00000000000..bcfc6eb4f71
--- /dev/null
+++ b/llvm/test/Verifier/gcread-ptrptr.ll
@@ -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
+}
diff --git a/llvm/test/Verifier/gcroot-alloca.ll b/llvm/test/Verifier/gcroot-alloca.ll
new file mode 100644
index 00000000000..c44321a065b
--- /dev/null
+++ b/llvm/test/Verifier/gcroot-alloca.ll
@@ -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
+}
diff --git a/llvm/test/Verifier/gcroot-meta.ll b/llvm/test/Verifier/gcroot-meta.ll
new file mode 100644
index 00000000000..51d19515afb
--- /dev/null
+++ b/llvm/test/Verifier/gcroot-meta.ll
@@ -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
+}
diff --git a/llvm/test/Verifier/gcroot-ptrptr.ll b/llvm/test/Verifier/gcroot-ptrptr.ll
new file mode 100644
index 00000000000..0a7738d866c
--- /dev/null
+++ b/llvm/test/Verifier/gcroot-ptrptr.ll
@@ -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
+}
diff --git a/llvm/test/Verifier/gcwrite-ptrptr.ll b/llvm/test/Verifier/gcwrite-ptrptr.ll
new file mode 100644
index 00000000000..b1e96c8aa6e
--- /dev/null
+++ b/llvm/test/Verifier/gcwrite-ptrptr.ll
@@ -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
+}