Remove llvm-upgrade and update tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48137 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Transforms/SimplifyLibCalls/StrLen.ll b/test/Transforms/SimplifyLibCalls/StrLen.ll
index 98a76c8..521a224 100644
--- a/test/Transforms/SimplifyLibCalls/StrLen.ll
+++ b/test/Transforms/SimplifyLibCalls/StrLen.ll
@@ -1,58 +1,56 @@
; Test that the StrCatOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
; RUN: not grep {call.*strlen}
target datalayout = "e-p:32:32"
+@hello = constant [6 x i8] c"hello\00" ; <[6 x i8]*> [#uses=3]
+@null = constant [1 x i8] zeroinitializer ; <[1 x i8]*> [#uses=3]
+@null_hello = constant [7 x i8] c"\00hello\00" ; <[7 x i8]*> [#uses=1]
-declare uint %strlen(sbyte*)
-%hello = constant [6 x sbyte] c"hello\00"
-%null = constant [1 x sbyte] c"\00"
-%null_hello = constant [7 x sbyte] c"\00hello\00"
+declare i32 @strlen(i8*)
-implementation ; Functions:
-
-uint %test1() {
- %hello_p = getelementptr [6 x sbyte]* %hello, int 0, int 0
- %hello_l = call uint %strlen(sbyte* %hello_p)
- ret uint %hello_l
+define i32 @test1() {
+ %hello_p = getelementptr [6 x i8]* @hello, i32 0, i32 0 ; <i8*> [#uses=1]
+ %hello_l = call i32 @strlen( i8* %hello_p ) ; <i32> [#uses=1]
+ ret i32 %hello_l
}
-uint %test2() {
- %null_p = getelementptr [1 x sbyte]* %null, int 0, int 0
- %null_l = call uint %strlen(sbyte* %null_p)
- ret uint %null_l
+define i32 @test2() {
+ %null_p = getelementptr [1 x i8]* @null, i32 0, i32 0 ; <i8*> [#uses=1]
+ %null_l = call i32 @strlen( i8* %null_p ) ; <i32> [#uses=1]
+ ret i32 %null_l
}
-uint %test3() {
- %null_hello_p = getelementptr [7 x sbyte]* %null_hello, int 0, int 0
- %null_hello_l = call uint %strlen(sbyte* %null_hello_p)
- ret uint %null_hello_l
+define i32 @test3() {
+ %null_hello_p = getelementptr [7 x i8]* @null_hello, i32 0, i32 0 ; <i8*> [#uses=1]
+ %null_hello_l = call i32 @strlen( i8* %null_hello_p ) ; <i32> [#uses=1]
+ ret i32 %null_hello_l
}
-bool %test4() {
- %hello_p = getelementptr [6 x sbyte]* %hello, int 0, int 0
- %hello_l = call uint %strlen(sbyte* %hello_p)
- %eq_hello = seteq uint %hello_l, 0
- ret bool %eq_hello
+define i1 @test4() {
+ %hello_p = getelementptr [6 x i8]* @hello, i32 0, i32 0 ; <i8*> [#uses=1]
+ %hello_l = call i32 @strlen( i8* %hello_p ) ; <i32> [#uses=1]
+ %eq_hello = icmp eq i32 %hello_l, 0 ; <i1> [#uses=1]
+ ret i1 %eq_hello
}
-bool %test5() {
- %null_p = getelementptr [1 x sbyte]* %null, int 0, int 0
- %null_l = call uint %strlen(sbyte* %null_p)
- %eq_null = seteq uint %null_l, 0
- ret bool %eq_null
+define i1 @test5() {
+ %null_p = getelementptr [1 x i8]* @null, i32 0, i32 0 ; <i8*> [#uses=1]
+ %null_l = call i32 @strlen( i8* %null_p ) ; <i32> [#uses=1]
+ %eq_null = icmp eq i32 %null_l, 0 ; <i1> [#uses=1]
+ ret i1 %eq_null
}
-bool %test6() {
- %hello_p = getelementptr [6 x sbyte]* %hello, int 0, int 0
- %hello_l = call uint %strlen(sbyte* %hello_p)
- %ne_hello = setne uint %hello_l, 0
- ret bool %ne_hello
+define i1 @test6() {
+ %hello_p = getelementptr [6 x i8]* @hello, i32 0, i32 0 ; <i8*> [#uses=1]
+ %hello_l = call i32 @strlen( i8* %hello_p ) ; <i32> [#uses=1]
+ %ne_hello = icmp ne i32 %hello_l, 0 ; <i1> [#uses=1]
+ ret i1 %ne_hello
}
-bool %test7() {
- %null_p = getelementptr [1 x sbyte]* %null, int 0, int 0
- %null_l = call uint %strlen(sbyte* %null_p)
- %ne_null = setne uint %null_l, 0
- ret bool %ne_null
+define i1 @test7() {
+ %null_p = getelementptr [1 x i8]* @null, i32 0, i32 0 ; <i8*> [#uses=1]
+ %null_l = call i32 @strlen( i8* %null_p ) ; <i32> [#uses=1]
+ %ne_null = icmp ne i32 %null_l, 0 ; <i1> [#uses=1]
+ ret i1 %ne_null
}