Remove llvm-upgrade and update tests.

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

1 files changed, 24 insertions, 26 deletions

diff --git a/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll b/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
index a910b58ac89..920cf3c4645 100644
--- a/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
+++ b/test/CodeGen/Generic/2006-06-13-ComputeMaskedBitsCrash.ll
@@ -1,35 +1,33 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -fast
+; RUN: llvm-as < %s | llc -fast
+	
+%struct.cl_perfunc_opts = type { i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i32, i32, i32, i32, i32, i32, i32 }
+@cl_pf_opts = external global %struct.cl_perfunc_opts		; <%struct.cl_perfunc_opts*> [#uses=2]
 
-	%struct.cl_perfunc_opts = type { ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, int, int, int, int, int, int, int }
-%cl_pf_opts = external global %struct.cl_perfunc_opts		; <%struct.cl_perfunc_opts*> [#uses=2]
-
-implementation   ; Functions:
-
-void %set_flags_from_O() {
+define void @set_flags_from_O() {
 entry:
-	%tmp22 = setgt int 0, 0		; <bool> [#uses=1]
-	br bool %tmp22, label %cond_true23, label %cond_next159
+	%tmp22 = icmp sgt i32 0, 0		; <i1> [#uses=1]
+	br i1 %tmp22, label %cond_true23, label %cond_next159
 
 cond_true23:		; preds = %entry
-	%tmp138 = getelementptr %struct.cl_perfunc_opts* %cl_pf_opts, int 0, uint 8		; <ubyte*> [#uses=1]
-	%tmp138 = cast ubyte* %tmp138 to uint*		; <uint*> [#uses=2]
-	%tmp139 = load uint* %tmp138		; <uint> [#uses=1]
-	%tmp140 = shl uint 1, ubyte 27		; <uint> [#uses=1]
-	%tmp141 = and uint %tmp140, 134217728		; <uint> [#uses=1]
-	%tmp142 = and uint %tmp139, 4160749567		; <uint> [#uses=1]
-	%tmp143 = or uint %tmp142, %tmp141		; <uint> [#uses=1]
-	store uint %tmp143, uint* %tmp138
-	%tmp144 = getelementptr %struct.cl_perfunc_opts* %cl_pf_opts, int 0, uint 8		; <ubyte*> [#uses=1]
-	%tmp144 = cast ubyte* %tmp144 to uint*		; <uint*> [#uses=1]
-	%tmp145 = load uint* %tmp144		; <uint> [#uses=1]
-	%tmp146 = shl uint %tmp145, ubyte 22		; <uint> [#uses=1]
-	%tmp147 = shr uint %tmp146, ubyte 31		; <uint> [#uses=1]
-	%tmp147 = cast uint %tmp147 to ubyte		; <ubyte> [#uses=1]
-	%tmp148 = seteq ubyte %tmp147, 0		; <bool> [#uses=1]
-	br bool %tmp148, label %cond_true149, label %cond_next159
+	%tmp138 = getelementptr %struct.cl_perfunc_opts* @cl_pf_opts, i32 0, i32 8		; <i8*> [#uses=1]
+	%tmp138.upgrd.1 = bitcast i8* %tmp138 to i32*		; <i32*> [#uses=2]
+	%tmp139 = load i32* %tmp138.upgrd.1		; <i32> [#uses=1]
+	%tmp140 = shl i32 1, 27		; <i32> [#uses=1]
+	%tmp141 = and i32 %tmp140, 134217728		; <i32> [#uses=1]
+	%tmp142 = and i32 %tmp139, -134217729		; <i32> [#uses=1]
+	%tmp143 = or i32 %tmp142, %tmp141		; <i32> [#uses=1]
+	store i32 %tmp143, i32* %tmp138.upgrd.1
+	%tmp144 = getelementptr %struct.cl_perfunc_opts* @cl_pf_opts, i32 0, i32 8		; <i8*> [#uses=1]
+	%tmp144.upgrd.2 = bitcast i8* %tmp144 to i32*		; <i32*> [#uses=1]
+	%tmp145 = load i32* %tmp144.upgrd.2		; <i32> [#uses=1]
+	%tmp146 = shl i32 %tmp145, 22		; <i32> [#uses=1]
+	%tmp147 = lshr i32 %tmp146, 31		; <i32> [#uses=1]
+	%tmp147.upgrd.3 = trunc i32 %tmp147 to i8		; <i8> [#uses=1]
+	%tmp148 = icmp eq i8 %tmp147.upgrd.3, 0		; <i1> [#uses=1]
+	br i1 %tmp148, label %cond_true149, label %cond_next159
 
 cond_true149:		; preds = %cond_true23
-	%tmp150 = cast ubyte* null to uint*		; <uint*> [#uses=0]
+	%tmp150 = bitcast i8* null to i32*		; <i32*> [#uses=0]
 	ret void
 
 cond_next159:		; preds = %cond_true23, %entry