5 files changed, 49 insertions, 55 deletions
diff --git a/test/Analysis/Andersens/arg-must-alias.ll b/test/Analysis/Andersens/arg-must-alias.ll
index d19b381e4a..9680bb5fa9 100644
--- a/test/Analysis/Andersens/arg-must-alias.ll
+++ b/test/Analysis/Andersens/arg-must-alias.ll
@@ -1,17 +1,15 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | not grep ARG
+; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | not grep ARG
 
-%G = internal constant int* null
+@G = internal constant i32* null
 
-implementation
-
-internal int %internal(int* %ARG) {
+define internal i32 @internal(i32* %ARG) {
 	;; The 'Arg' argument must-aliases the null pointer, so it can be subsituted
 	;; directly here, making it dead.
-	store int* %ARG, int** %G
-	ret int 0
+	store i32* %ARG, i32** @G
+	ret i32 0
 }
 
-int %foo() {
-	%V = call int %internal(int* null)
-	ret int %V
+define i32 @foo() {
+	%V = call i32 @internal(i32* null)
+	ret i32 %V
 }
diff --git a/test/Analysis/Andersens/basictest.ll b/test/Analysis/Andersens/basictest.ll
index 5730f75b5b..d84c8feaaa 100644
--- a/test/Analysis/Andersens/basictest.ll
+++ b/test/Analysis/Andersens/basictest.ll
@@ -1,30 +1,28 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -aa-eval
+; RUN: llvm-as < %s | opt -anders-aa -aa-eval
 
-implementation
-
-void %test1() {
-	%X = malloc int*
-	%Y = malloc int
-	%Z = cast int* %Y to int
-	%W = cast int %Z to int*
-	store int* %W, int** %X
+define void @test1() {
+	%X = malloc i32*
+	%Y = malloc i32
+	%Z = ptrtoint i32* %Y to i32
+	%W = inttoptr i32 %Z to i32*
+	store i32* %W, i32** %X
 	ret void
 }
 
-void %test2(int* %P) {
-	%X = malloc int*
-	%Y = malloc int
-	store int* %P, int** %X
+define void @test2(i32* %P) {
+	%X = malloc i32*
+	%Y = malloc i32
+	store i32* %P, i32** %X
 	ret void
 }
 
-internal int *%test3(int* %P) {
-	ret int* %P
+define internal i32 *@test3(i32* %P) {
+	ret i32* %P
 }
 
-void %test4() {
-	%X = malloc int
-	%Y = call int* %test3(int* %X)
-	%ZZ = getelementptr int* null, int 17
+define void @test4() {
+	%X = malloc i32
+	%Y = call i32* @test3(i32* %X)
+	%ZZ = getelementptr i32* null, i32 17
 	ret void
 }
diff --git a/test/Analysis/Andersens/external.ll b/test/Analysis/Andersens/external.ll
index a829999f44..183319513e 100644
--- a/test/Analysis/Andersens/external.ll
+++ b/test/Analysis/Andersens/external.ll
@@ -1,22 +1,20 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | grep store | not grep null
+; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -deadargelim | llvm-dis | grep store | not grep null
 
 ; Because the 'internal' function is passed to an external function, we don't
 ; know what the incoming values will alias.  As such, we cannot do the 
 ; optimization checked by the 'arg-must-alias.llx' test.
 
-declare void %external(int(int*)*)
-%G = internal constant int* null
+declare void @external(i32(i32*)*)
+@G = internal constant i32* null
 
-implementation
-
-internal int %internal(int* %ARG) {
+define internal i32 @internal(i32* %ARG) {
 	;;; We *DON'T* know that ARG always points to null!
-	store int* %ARG, int** %G
-	ret int 0
+	store i32* %ARG, i32** @G
+	ret i32 0
 }
 
-int %foo() {
-	call void %external(int(int*)* %internal)
-	%V = call int %internal(int* null)
-	ret int %V
+define i32 @foo() {
+	call void @external(i32(i32*)* @internal)
+	%V = call i32 @internal(i32* null)
+	ret i32 %V
 }
diff --git a/test/Analysis/Andersens/modreftest.ll b/test/Analysis/Andersens/modreftest.ll
index 0716614219..b5c60cd790 100644
--- a/test/Analysis/Andersens/modreftest.ll
+++ b/test/Analysis/Andersens/modreftest.ll
@@ -1,15 +1,15 @@
-; RUN: llvm-upgrade < %s | llvm-as | \
-; RUN:   opt -anders-aa -load-vn -gcse -instcombine | llvm-dis | \
-; RUN:   grep {ret i1 true}
+; RUN: llvm-as < %s | opt -anders-aa -load-vn -gcse -instcombine | llvm-dis \  
+; RUN: | grep {ret i1 true}
 
-%G = internal global int* null
-declare int *%ext()
-bool %bar() {
-  %V1 = load int** %G
-  %X2 = call int *%ext()
-  %V2 = load int** %G
-  store int* %X2, int** %G
+@G = internal global i32* null
+declare i32 *@ext()
 
-  %C = seteq int* %V1, %V2
-  ret bool %C
+define i1 @bar() {
+  %V1 = load i32** @G
+  %X2 = call i32 *@ext()
+  %V2 = load i32** @G
+  store i32* %X2, i32** @G
+
+  %C = icmp eq i32* %V1, %V2
+  ret i1 %C
 }
diff --git a/test/Analysis/Andersens/trivialtest.ll b/test/Analysis/Andersens/trivialtest.ll
index 9e447d6d6b..ce37516b36 100644
--- a/test/Analysis/Andersens/trivialtest.ll
+++ b/test/Analysis/Andersens/trivialtest.ll
@@ -1,3 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -disable-output
+; RUN: llvm-as < %s | opt -anders-aa -disable-output
 
-void %foo() { ret void }
+define void @foo() { ret void }