Remove llvm-upgrade and update tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47296 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll b/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll
index 2a424be..b99aa98 100644
--- a/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll
+++ b/test/CodeGen/Generic/2006-04-26-SetCCAnd.ll
@@ -1,36 +1,33 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-as < %s | llc
; PR748
+@G = external global i16 ; <i16*> [#uses=1]
-%G = external global ushort ; <ushort*> [#uses=1]
-
-implementation ; Functions:
-
-void %OmNewObjHdr() {
+define void @OmNewObjHdr() {
entry:
- br bool false, label %endif.4, label %then.0
+ br i1 false, label %endif.4, label %then.0
then.0: ; preds = %entry
ret void
endif.4: ; preds = %entry
- br bool false, label %else.3, label %shortcirc_next.3
+ br i1 false, label %else.3, label %shortcirc_next.3
shortcirc_next.3: ; preds = %endif.4
ret void
else.3: ; preds = %endif.4
- switch int 0, label %endif.10 [
- int 5001, label %then.10
- int -5008, label %then.10
+ switch i32 0, label %endif.10 [
+ i32 5001, label %then.10
+ i32 -5008, label %then.10
]
then.10: ; preds = %else.3, %else.3
- %tmp.112 = load ushort* null ; <ushort> [#uses=2]
- %tmp.113 = load ushort* %G ; <ushort> [#uses=2]
- %tmp.114 = setgt ushort %tmp.112, %tmp.113 ; <bool> [#uses=1]
- %tmp.120 = setlt ushort %tmp.112, %tmp.113 ; <bool> [#uses=1]
- %bothcond = and bool %tmp.114, %tmp.120 ; <bool> [#uses=1]
- br bool %bothcond, label %else.4, label %then.11
+ %tmp.112 = load i16* null ; <i16> [#uses=2]
+ %tmp.113 = load i16* @G ; <i16> [#uses=2]
+ %tmp.114 = icmp ugt i16 %tmp.112, %tmp.113 ; <i1> [#uses=1]
+ %tmp.120 = icmp ult i16 %tmp.112, %tmp.113 ; <i1> [#uses=1]
+ %bothcond = and i1 %tmp.114, %tmp.120 ; <i1> [#uses=1]
+ br i1 %bothcond, label %else.4, label %then.11
then.11: ; preds = %then.10
ret void