Remove llvm-upgrade and update test cases.

llvm-svn: 47793

1 files changed, 110 insertions, 112 deletions

diff --git a/llvm/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll b/llvm/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll
index 70d1e0aa8c1..48e5a768e0e 100644
--- a/llvm/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll
+++ b/llvm/test/Transforms/CodeExtractor/2004-03-18-InvokeHandling.ll
@@ -1,97 +1,95 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-extract -disable-output
+; RUN: llvm-as < %s | opt -loop-extract -disable-output
 
-implementation   ; Functions:
+declare i32 @_IO_getc()
 
-declare int %_IO_getc()
+declare void @__errno_location()
 
-declare void %__errno_location()
-
-void %yylex() {
+define void @yylex() {
 entry:
-	switch uint 0, label %label.126 [
-		 uint 0, label %return
-		 uint 61, label %combine
-		 uint 33, label %combine
-		 uint 94, label %combine
-		 uint 37, label %combine
-		 uint 47, label %combine
-		 uint 42, label %combine
-		 uint 62, label %combine
-		 uint 60, label %combine
-		 uint 58, label %combine
-		 uint 124, label %combine
-		 uint 38, label %combine
-		 uint 45, label %combine
-		 uint 43, label %combine
-		 uint 34, label %string_constant
-		 uint 39, label %char_constant
-		 uint 46, label %loopexit.2
-		 uint 57, label %loopexit.2
-		 uint 56, label %loopexit.2
-		 uint 55, label %loopexit.2
-		 uint 54, label %loopexit.2
-		 uint 53, label %loopexit.2
-		 uint 52, label %loopexit.2
-		 uint 51, label %loopexit.2
-		 uint 50, label %loopexit.2
-		 uint 49, label %loopexit.2
-		 uint 48, label %loopexit.2
-		 uint 95, label %letter
-		 uint 122, label %letter
-		 uint 121, label %letter
-		 uint 120, label %letter
-		 uint 119, label %letter
-		 uint 118, label %letter
-		 uint 117, label %letter
-		 uint 116, label %letter
-		 uint 115, label %letter
-		 uint 114, label %letter
-		 uint 113, label %letter
-		 uint 112, label %letter
-		 uint 111, label %letter
-		 uint 110, label %letter
-		 uint 109, label %letter
-		 uint 108, label %letter
-		 uint 107, label %letter
-		 uint 106, label %letter
-		 uint 105, label %letter
-		 uint 104, label %letter
-		 uint 103, label %letter
-		 uint 102, label %letter
-		 uint 101, label %letter
-		 uint 100, label %letter
-		 uint 99, label %letter
-		 uint 98, label %letter
-		 uint 97, label %letter
-		 uint 90, label %letter
-		 uint 89, label %letter
-		 uint 88, label %letter
-		 uint 87, label %letter
-		 uint 86, label %letter
-		 uint 85, label %letter
-		 uint 84, label %letter
-		 uint 83, label %letter
-		 uint 82, label %letter
-		 uint 81, label %letter
-		 uint 80, label %letter
-		 uint 79, label %letter
-		 uint 78, label %letter
-		 uint 77, label %letter
-		 uint 75, label %letter
-		 uint 74, label %letter
-		 uint 73, label %letter
-		 uint 72, label %letter
-		 uint 71, label %letter
-		 uint 70, label %letter
-		 uint 69, label %letter
-		 uint 68, label %letter
-		 uint 67, label %letter
-		 uint 66, label %letter
-		 uint 65, label %letter
-		 uint 64, label %label.13
-		 uint 76, label %label.12
-		 uint 36, label %label.11
-		 uint 4294967295, label %label.10
+	switch i32 0, label %label.126 [
+		 i32 0, label %return
+		 i32 61, label %combine
+		 i32 33, label %combine
+		 i32 94, label %combine
+		 i32 37, label %combine
+		 i32 47, label %combine
+		 i32 42, label %combine
+		 i32 62, label %combine
+		 i32 60, label %combine
+		 i32 58, label %combine
+		 i32 124, label %combine
+		 i32 38, label %combine
+		 i32 45, label %combine
+		 i32 43, label %combine
+		 i32 34, label %string_constant
+		 i32 39, label %char_constant
+		 i32 46, label %loopexit.2
+		 i32 57, label %loopexit.2
+		 i32 56, label %loopexit.2
+		 i32 55, label %loopexit.2
+		 i32 54, label %loopexit.2
+		 i32 53, label %loopexit.2
+		 i32 52, label %loopexit.2
+		 i32 51, label %loopexit.2
+		 i32 50, label %loopexit.2
+		 i32 49, label %loopexit.2
+		 i32 48, label %loopexit.2
+		 i32 95, label %letter
+		 i32 122, label %letter
+		 i32 121, label %letter
+		 i32 120, label %letter
+		 i32 119, label %letter
+		 i32 118, label %letter
+		 i32 117, label %letter
+		 i32 116, label %letter
+		 i32 115, label %letter
+		 i32 114, label %letter
+		 i32 113, label %letter
+		 i32 112, label %letter
+		 i32 111, label %letter
+		 i32 110, label %letter
+		 i32 109, label %letter
+		 i32 108, label %letter
+		 i32 107, label %letter
+		 i32 106, label %letter
+		 i32 105, label %letter
+		 i32 104, label %letter
+		 i32 103, label %letter
+		 i32 102, label %letter
+		 i32 101, label %letter
+		 i32 100, label %letter
+		 i32 99, label %letter
+		 i32 98, label %letter
+		 i32 97, label %letter
+		 i32 90, label %letter
+		 i32 89, label %letter
+		 i32 88, label %letter
+		 i32 87, label %letter
+		 i32 86, label %letter
+		 i32 85, label %letter
+		 i32 84, label %letter
+		 i32 83, label %letter
+		 i32 82, label %letter
+		 i32 81, label %letter
+		 i32 80, label %letter
+		 i32 79, label %letter
+		 i32 78, label %letter
+		 i32 77, label %letter
+		 i32 75, label %letter
+		 i32 74, label %letter
+		 i32 73, label %letter
+		 i32 72, label %letter
+		 i32 71, label %letter
+		 i32 70, label %letter
+		 i32 69, label %letter
+		 i32 68, label %letter
+		 i32 67, label %letter
+		 i32 66, label %letter
+		 i32 65, label %letter
+		 i32 64, label %label.13
+		 i32 76, label %label.12
+		 i32 36, label %label.11
+		 i32 -1, label %label.10
 	]
 
 label.10:		; preds = %entry
@@ -110,15 +108,15 @@ letter:		; preds = %entry, %entry, %entry, %entry, %entry, %entry, %entry, %entr
 	ret void
 
 loopexit.2:		; preds = %entry, %entry, %entry, %entry, %entry, %entry, %entry, %entry, %entry, %entry, %entry
-	switch int 0, label %shortcirc_next.14 [
-		 int 48, label %then.20
-		 int 46, label %endif.38
+	switch i32 0, label %shortcirc_next.14 [
+		 i32 48, label %then.20
+		 i32 46, label %endif.38
 	]
 
 then.20:		; preds = %loopexit.2
-	switch int 0, label %else.4 [
-		 int 120, label %then.21
-		 int 88, label %then.21
+	switch i32 0, label %else.4 [
+		 i32 120, label %then.21
+		 i32 88, label %then.21
 	]
 
 then.21:		; preds = %then.20, %then.20
@@ -131,23 +129,23 @@ shortcirc_next.14:		; preds = %loopexit.2
 	ret void
 
 endif.38:		; preds = %loopexit.2
-	br bool false, label %then.40, label %then.39
+	br i1 false, label %then.40, label %then.39
 
 then.39:		; preds = %endif.38
 	ret void
 
 then.40:		; preds = %endif.38
-	invoke void %__errno_location( )
+	invoke void @__errno_location( )
 			to label %switchexit.2 unwind label %LongJmpBlkPre
 
 loopentry.6:		; preds = %endif.52
-	switch uint 0, label %switchexit.2 [
-		 uint 73, label %label.82
-		 uint 105, label %label.82
-		 uint 76, label %label.80
-		 uint 108, label %label.80
-		 uint 70, label %label.78
-		 uint 102, label %label.78
+	switch i32 0, label %switchexit.2 [
+		 i32 73, label %label.82
+		 i32 105, label %label.82
+		 i32 76, label %label.80
+		 i32 108, label %label.80
+		 i32 70, label %label.78
+		 i32 102, label %label.78
 	]
 
 label.78:		; preds = %loopentry.6, %loopentry.6
@@ -157,21 +155,21 @@ label.80:		; preds = %loopentry.6, %loopentry.6
 	ret void
 
 label.82:		; preds = %loopentry.6, %loopentry.6
-	%c.0.15.5 = phi int [ %tmp.79417, %loopentry.6 ], [ %tmp.79417, %loopentry.6 ]		; <int> [#uses=0]
+	%c.0.15.5 = phi i32 [ %tmp.79417, %loopentry.6 ], [ %tmp.79417, %loopentry.6 ]		; <i32> [#uses=0]
 	ret void
 
-switchexit.2:		; preds = %then.40, %loopentry.6
-	br bool false, label %endif.51, label %loopexit.6
+switchexit.2:		; preds = %loopentry.6, %then.40
+	br i1 false, label %endif.51, label %loopexit.6
 
 endif.51:		; preds = %switchexit.2
-	br bool false, label %endif.52, label %then.52
+	br i1 false, label %endif.52, label %then.52
 
 then.52:		; preds = %endif.51
 	ret void
 
 endif.52:		; preds = %endif.51
-	%tmp.79417 = invoke int %_IO_getc( )
-			to label %loopentry.6 unwind label %LongJmpBlkPre		; <int> [#uses=2]
+	%tmp.79417 = invoke i32 @_IO_getc( )
+			to label %loopentry.6 unwind label %LongJmpBlkPre		; <i32> [#uses=2]
 
 loopexit.6:		; preds = %switchexit.2
 	ret void
@@ -191,6 +189,6 @@ label.126:		; preds = %entry
 return:		; preds = %entry
 	ret void
 
-LongJmpBlkPre:		; preds = %then.40, %endif.52
+LongJmpBlkPre:		; preds = %endif.52, %then.40
 	ret void
 }