Remove llvm-upgrade and update tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48103 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 12 insertions, 11 deletions

diff --git a/test/Transforms/InstCombine/cast-and-cast.ll b/test/Transforms/InstCombine/cast-and-cast.ll
index 8da9d3370d..f90cb7499a 100644
--- a/test/Transforms/InstCombine/cast-and-cast.ll
+++ b/test/Transforms/InstCombine/cast-and-cast.ll
@@ -1,16 +1,17 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:   not grep bitcast
 
-bool %test1(uint %val) {
-  %t1 = bitcast uint %val to int 
-  %t2 = and int %t1, 1
-  %t3 = trunc int %t2 to bool
-  ret bool %t3
+define i1 @test1(i32 %val) {
+        %t1 = bitcast i32 %val to i32           ; <i32> [#uses=1]
+        %t2 = and i32 %t1, 1            ; <i32> [#uses=1]
+        %t3 = trunc i32 %t2 to i1               ; <i1> [#uses=1]
+        ret i1 %t3
 }
 
-short %test1(uint %val) {
-  %t1 = bitcast uint %val to int 
-  %t2 = and int %t1, 1
-  %t3 = trunc int %t2 to short
-  ret short %t3
+define i16 @test1.upgrd.1(i32 %val) {
+        %t1 = bitcast i32 %val to i32           ; <i32> [#uses=1]
+        %t2 = and i32 %t1, 1            ; <i32> [#uses=1]
+        %t3 = trunc i32 %t2 to i16              ; <i16> [#uses=1]
+        ret i16 %t3
 }
+