Byebye llvm-upgrade!

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

4 files changed, 14 insertions, 43 deletions

diff --git a/test/Transforms/LoopRotate/LRCrash-1.ll b/test/Transforms/LoopRotate/LRCrash-1.ll
index 0149482..e6c7667 100644
--- a/test/Transforms/LoopRotate/LRCrash-1.ll
+++ b/test/Transforms/LoopRotate/LRCrash-1.ll
@@ -1,27 +1,18 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-rotate -disable-output
-
+; RUN: llvm-as < %s | opt -loop-rotate -disable-output
 
 	%struct.relation = type { [4 x i16], i32, [4 x i16], i32, i32 }
 
-
-
-
-
-
-void @findAllPairs() {
+define void @findAllPairs() {
 entry:
 	br i1 false, label %bb139, label %bb10.i44
-
 bb10.i44:		; preds = %entry
 	ret void
-
 bb127:		; preds = %bb139
 	br label %bb139
-
 bb139:		; preds = %bb127, %entry
 	br i1 false, label %bb127, label %bb142
-
 bb142:		; preds = %bb139
 	%r91.0.lcssa = phi %struct.relation* [ null, %bb139 ]		; <%struct.relation*> [#uses=0]
 	ret void
 }
+
diff --git a/test/Transforms/LoopRotate/LRCrash-2.ll b/test/Transforms/LoopRotate/LRCrash-2.ll
index bceeb91..6dbe76d 100644
--- a/test/Transforms/LoopRotate/LRCrash-2.ll
+++ b/test/Transforms/LoopRotate/LRCrash-2.ll
@@ -1,30 +1,24 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-rotate -disable-output
+; RUN: llvm-as < %s | opt -loop-rotate -disable-output
 
-void @findAllPairs() {
+define void @findAllPairs() {
 entry:
 	br i1 false, label %bb139, label %cond_true
-
 cond_true:		; preds = %entry
 	ret void
-
 bb90:		; preds = %bb139
 	br i1 false, label %bb136, label %cond_next121
-
 cond_next121:		; preds = %bb90
 	br i1 false, label %bb136, label %bb127
-
 bb127:		; preds = %cond_next121
 	br label %bb136
-
 bb136:		; preds = %bb127, %cond_next121, %bb90
 	%changes.1 = phi i32 [ %changes.2, %bb90 ], [ %changes.2, %cond_next121 ], [ 1, %bb127 ]		; <i32> [#uses=1]
 	br label %bb139
-
 bb139:		; preds = %bb136, %entry
 	%changes.2 = phi i32 [ %changes.1, %bb136 ], [ 0, %entry ]		; <i32> [#uses=3]
 	br i1 false, label %bb90, label %bb142
-
 bb142:		; preds = %bb139
 	%changes.2.lcssa = phi i32 [ %changes.2, %bb139 ]		; <i32> [#uses=0]
 	ret void
 }
+
diff --git a/test/Transforms/LoopRotate/LRCrash-3.ll b/test/Transforms/LoopRotate/LRCrash-3.ll
index e927035..94991a5 100644
--- a/test/Transforms/LoopRotate/LRCrash-3.ll
+++ b/test/Transforms/LoopRotate/LRCrash-3.ll
@@ -1,41 +1,29 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-rotate -disable-output
+; RUN: llvm-as < %s | opt -loop-rotate -disable-output
 
-
-
-
-void @_ZN9Classfile4readEv() {
+define void @_ZN9Classfile4readEv() {
 entry:
 	br i1 false, label %cond_false485, label %bb405
-
 bb405:		; preds = %entry
 	ret void
-
 cond_false485:		; preds = %entry
 	br label %bb830
-
 bb511:		; preds = %bb830
 	br i1 false, label %bb816, label %bb830
-
 cond_next667:		; preds = %bb816
 	br i1 false, label %cond_next695, label %bb680
-
 bb676:		; preds = %bb680
 	br label %bb680
-
 bb680:		; preds = %bb676, %cond_next667
 	%iftmp.68.0 = zext i1 false to i8		; <i8> [#uses=1]
 	br i1 false, label %bb676, label %cond_next695
-
 cond_next695:		; preds = %bb680, %cond_next667
 	%iftmp.68.2 = phi i8 [ %iftmp.68.0, %bb680 ], [ undef, %cond_next667 ]		; <i8> [#uses=0]
 	ret void
-
 bb816:		; preds = %bb816, %bb511
 	br i1 false, label %cond_next667, label %bb816
-
 bb830:		; preds = %bb511, %cond_false485
 	br i1 false, label %bb511, label %bb835
-
 bb835:		; preds = %bb830
 	ret void
 }
+
diff --git a/test/Transforms/LoopRotate/LRCrash-4.ll b/test/Transforms/LoopRotate/LRCrash-4.ll
index 721132d..ab43fc8 100644
--- a/test/Transforms/LoopRotate/LRCrash-4.ll
+++ b/test/Transforms/LoopRotate/LRCrash-4.ll
@@ -1,20 +1,18 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-rotate -disable-output
+; RUN: llvm-as < %s | opt -loop-rotate -disable-output
 
-
-void @InterpretSEIMessage(i8* %msg) {
+define void @InterpretSEIMessage(i8* %msg) {
 entry:
 	br label %bb15
-
 bb6:		; preds = %bb15
-	%tmp11 = getelementptr i8* %msg, i32 %offset.1		; <i8*> [#uses=0]
+	%gep.upgrd.1 = zext i32 %offset.1 to i64		; <i64> [#uses=1]
+	%tmp11 = getelementptr i8* %msg, i64 %gep.upgrd.1		; <i8*> [#uses=0]
 	br label %bb15
-
 bb15:		; preds = %bb6, %entry
 	%offset.1 = add i32 0, 1		; <i32> [#uses=2]
 	br i1 false, label %bb6, label %bb17
-
 bb17:		; preds = %bb15
 	%offset.1.lcssa = phi i32 [ %offset.1, %bb15 ]		; <i32> [#uses=0]
 	%payload_type.1.lcssa = phi i32 [ 0, %bb15 ]		; <i32> [#uses=0]
 	ret void
 }
+