Promote GEP ubyte indices to uint. Backwards compatibility for 1.2 and

older features will be dropped soon and these test cases must not rely
on the upgrade capability.


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

31 files changed, 59 insertions, 59 deletions

diff --git a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
index d489596927..e3f8de2f15 100644
--- a/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
+++ b/test/Transforms/ADCE/2002-05-23-ZeroArgPHITest.ll
@@ -23,7 +23,7 @@ bb1:					;[#uses=2]
 
 bb2:					;[#uses=3]
 	%reg109 = phi %node_t* [ %reg110, %bb2 ], [ %reg107, %bb1 ]		; <%node_t*> [#uses=1]
-	%reg212 = getelementptr %node_t* %reg109, long 0, ubyte 1		; <%node_t**> [#uses=1]
+	%reg212 = getelementptr %node_t* %reg109, long 0, uint 1		; <%node_t**> [#uses=1]
 	%reg110 = load %node_t** %reg212		; <%node_t*> [#uses=2]
 	%cond213 = setne %node_t* %reg110, null		; <bool> [#uses=1]
 	br bool %cond213, label %bb2, label %bb3
diff --git a/test/Transforms/ADCE/basictest1.ll b/test/Transforms/ADCE/basictest1.ll
index f2db309d32..77a34df66e 100644
--- a/test/Transforms/ADCE/basictest1.ll
+++ b/test/Transforms/ADCE/basictest1.ll
@@ -39,7 +39,7 @@ bb3:					;[#uses=2]
 	br bool %cond267, label %bb5, label %bb4
 
 bb4:					;[#uses=2]
-	%reg111 = getelementptr [20 x %FILE]* %__iob, long 0, long 1, ubyte 3		; <ubyte*> [#uses=1]
+	%reg111 = getelementptr [20 x %FILE]* %__iob, long 0, long 1, uint 3		; <ubyte*> [#uses=1]
 	%cast274 = getelementptr [34 x sbyte]* %.LC9, long 0, long 0		; <sbyte*> [#uses=0]
 	%cast282 = cast ubyte* %reg111 to %FILE*		; <%FILE*> [#uses=0]
 	call void %exit( int 1 )
@@ -49,9 +49,9 @@ bb5:					;[#uses=1]
 	%reg107-idxcast1 = cast int %fd to long		; <long> [#uses=2]
 	%reg107-idxcast2 = cast int %fd to long		; <long> [#uses=1]
 	%reg1311 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast2		; <%spec_fd_t*> [#uses=1]
-	%idx1 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, ubyte 2		; <int> [#uses=3]
+	%idx1 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, uint 2		; <int> [#uses=3]
 	%reg1321 = load int* %idx1
-	%idx2 = getelementptr %spec_fd_t* %reg1311, long 0, ubyte 1		; <int> [#uses=1]
+	%idx2 = getelementptr %spec_fd_t* %reg1311, long 0, uint 1		; <int> [#uses=1]
 	%reg1331 = load int* %idx2
 	%cond270 = setlt int %reg1321, %reg1331		; <bool> [#uses=1]
 	br bool %cond270, label %bb9, label %bb6
@@ -70,14 +70,14 @@ bb8:					;[#uses=3]
 
 bb9:					;[#uses=1]
 	%reg107-idxcast3 = cast int %fd to long		; <long> [#uses=1]
-	%idx3 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast3, ubyte 3		; <ubyte*> [#uses=1]
+	%idx3 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast3, uint 3		; <ubyte*> [#uses=1]
 	%reg1601 = load ubyte** %idx3
 	%reg132-idxcast1 = cast int %reg1321 to long		; <long> [#uses=1]
 	%idx4 = getelementptr ubyte* %reg1601, long %reg132-idxcast1		; <ubyte> [#uses=2]
 	%reg1621 = load ubyte* %idx4
 	%cast108 = cast ubyte %reg1621 to long		; <long> [#uses=0]
 	%reg157 = add int %reg1321, 1		; <int> [#uses=1]
-	%idx5 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, ubyte 2
+	%idx5 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, uint 2
 	store int %reg157, int* %idx5
 	%reg163 = load int* %dbglvl		; <int> [#uses=1]
 	%cond272 = setle int %reg163, 4		; <bool> [#uses=1]
diff --git a/test/Transforms/ADCE/basictest2.ll b/test/Transforms/ADCE/basictest2.ll
index 6df243d095..ffb2c1ddbe 100644
--- a/test/Transforms/ADCE/basictest2.ll
+++ b/test/Transforms/ADCE/basictest2.ll
@@ -40,7 +40,7 @@ bb3:					;[#uses=2]
 	br label %bb5
 
 bb4:					;[#uses=2]
-	%reg111 = getelementptr [20 x %FILE]* %__iob, long 0, long 1, ubyte 3		; <ubyte*> [#uses=1]
+	%reg111 = getelementptr [20 x %FILE]* %__iob, long 0, long 1, uint 3		; <ubyte*> [#uses=1]
 	%cast274 = getelementptr [34 x sbyte]* %.LC9, long 0, long 0		; <sbyte*> [#uses=0]
 	%cast282 = cast ubyte* %reg111 to %FILE*		; <%FILE*> [#uses=0]
 	call void %exit( int 1 )
@@ -50,9 +50,9 @@ bb5:					;[#uses=1]
 	%reg107-idxcast1 = cast int %fd to long		; <long> [#uses=2]
 	%reg107-idxcast2 = cast int %fd to long		; <long> [#uses=1]
 	%reg1311 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast2		; <%spec_fd_t*> [#uses=1]
-	%idx1 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, ubyte 2		; <int> [#uses=3]
+	%idx1 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, uint 2		; <int> [#uses=3]
 	%reg1321 = load int* %idx1
-	%idx2 = getelementptr %spec_fd_t* %reg1311, long 0, ubyte 1		; <int> [#uses=1]
+	%idx2 = getelementptr %spec_fd_t* %reg1311, long 0, uint 1		; <int> [#uses=1]
 	%reg1331 = load int* %idx2
 	%cond270 = setlt int %reg1321, %reg1331		; <bool> [#uses=1]
 	br bool %cond270, label %bb9, label %bb6
@@ -71,14 +71,14 @@ bb8:					;[#uses=3]
 
 bb9:					;[#uses=1]
 	%reg107-idxcast3 = cast int %fd to long		; <uint> [#uses=1]
-	%idx3 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast3, ubyte 3		; <ubyte*> [#uses=1]
+	%idx3 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast3, uint 3		; <ubyte*> [#uses=1]
 	%reg1601 = load ubyte** %idx3
 	%reg132-idxcast1 = cast int %reg1321 to long		; <long> [#uses=1]
 	%idx4 = getelementptr ubyte* %reg1601, long %reg132-idxcast1		; <ubyte> [#uses=2]
 	%reg1621 = load ubyte* %idx4
 	%cast108 = cast ubyte %reg1621 to long		; <long> [#uses=0]
 	%reg157 = add int %reg1321, 1		; <int> [#uses=1]
-	%idx5 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, ubyte 2
+	%idx5 = getelementptr [3 x %spec_fd_t]* %spec_fd, long 0, long %reg107-idxcast1, uint 2
 	store int %reg157, int* %idx5
 	%reg163 = load int* %dbglvl		; <int> [#uses=1]
 	%cond272 = setle int %reg163, 4		; <bool> [#uses=1]
diff --git a/test/Transforms/ArgumentPromotion/aggregate-promote.ll b/test/Transforms/ArgumentPromotion/aggregate-promote.ll
index d6041f644f..b43b168b7b 100644
--- a/test/Transforms/ArgumentPromotion/aggregate-promote.ll
+++ b/test/Transforms/ArgumentPromotion/aggregate-promote.ll
@@ -7,8 +7,8 @@
 implementation
 
 internal int %test(%QuadTy* %P) {
-	%A = getelementptr %QuadTy* %P, long 0, ubyte 3
-	%B = getelementptr %QuadTy* %P, long 0, ubyte 2
+	%A = getelementptr %QuadTy* %P, long 0, uint 3
+	%B = getelementptr %QuadTy* %P, long 0, uint 2
 	%a = load int* %A
 	%b = load int* %B
 	%V = add int %a, %b
diff --git a/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll b/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
index 85d0436114..ce15a43cb8 100644
--- a/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
+++ b/test/Transforms/ConstantMerge/2002-09-23-CPR-Update.ll
@@ -8,7 +8,7 @@ implementation
 declare int %test(int*)
 
 void %foo() {
-	call int %test(int* getelementptr ( {int} * %foo, long 0, ubyte 0))
-	call int %test(int* getelementptr ( {int} * %bar, long 0, ubyte 0))
+	call int %test(int* getelementptr ( {int} * %foo, long 0, uint 0))
+	call int %test(int* getelementptr ( {int} * %bar, long 0, uint 0))
 	ret void
 }
diff --git a/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll b/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
index c36e8698e6..420373f3bc 100644
--- a/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
+++ b/test/Transforms/CorrelatedExprs/2002-10-04-ForwardingBug.ll
@@ -18,12 +18,12 @@ bb2:		; preds = %bb3, %bb0
 	br bool %cond217, label %bb4, label %bb3
 
 bb3:		; preds = %bb2
-	%reg221 = getelementptr %HANDLE* %reg113, long 0, ubyte 1		; <%HANDLE**> [#uses=1]
+	%reg221 = getelementptr %HANDLE* %reg113, long 0, uint 1		; <%HANDLE**> [#uses=1]
 	%reg108 = load %HANDLE** %reg221		; <%HANDLE*> [#uses=1]
-	%reg226 = getelementptr %HANDLE* %reg113, long 0, ubyte 2		; <%HANDLE**> [#uses=1]
+	%reg226 = getelementptr %HANDLE* %reg113, long 0, uint 2		; <%HANDLE**> [#uses=1]
 	%reg109 = load %HANDLE** %reg226		; <%HANDLE*> [#uses=1]
 	call void %InOrder( %HANDLE* %reg108 )
-	%cast231 = getelementptr %HANDLE* %reg113, long 0, ubyte 0		; <int*> [#uses=1]
+	%cast231 = getelementptr %HANDLE* %reg113, long 0, uint 0		; <int*> [#uses=1]
 	%reg111 = load int* %cast231		; <int> [#uses=1]
 	%reg233 = call int (sbyte*, ...)* %printf( sbyte* getelementptr ([11 x sbyte]* %.LC0, long 0, long 0), int %reg111, uint 0 )		; <int> [#uses=0]
 	br label %bb2
diff --git a/test/Transforms/DSAnalysis/arraytest.ll b/test/Transforms/DSAnalysis/arraytest.ll
index 0484341c48..19410efe0b 100644
--- a/test/Transforms/DSAnalysis/arraytest.ll
+++ b/test/Transforms/DSAnalysis/arraytest.ll
@@ -5,35 +5,35 @@
 implementation
 
 sbyte *%test1(%crazy* %P1) {    ; No merging, constant indexing
-	%P = getelementptr %crazy* %P1, long 0, long 0, ubyte 0, long 1
+	%P = getelementptr %crazy* %P1, long 0, long 0, uint 0, long 1
 	ret sbyte *%P
 }
 
 sbyte *%test2(%crazy* %P1) {    ; No merging, constant indexing
-	%P = getelementptr %crazy* %P1, long 0, long 1, ubyte 0, long 0
+	%P = getelementptr %crazy* %P1, long 0, long 1, uint 0, long 0
 	ret sbyte *%P
 }
 
 sbyte *%test3(%crazy* %P1) {    ; No merging, constant indexing, must handle outter index
-	%P = getelementptr %crazy* %P1, long -1, long 0, ubyte 0, long 0
+	%P = getelementptr %crazy* %P1, long -1, long 0, uint 0, long 0
 	ret sbyte *%P
 }
 
 sbyte *%mtest1(%crazy* %P1, long %idx) {    ; Merging deepest array
-	%P = getelementptr %crazy* %P1, long 0, long 0, ubyte 0, long %idx
+	%P = getelementptr %crazy* %P1, long 0, long 0, uint 0, long %idx
 	ret sbyte *%P
 }
 sbyte *%mtest2(%crazy* %P1, long %idx) {    ; Merge top array
-	%P = getelementptr %crazy* %P1, long 0, long %idx, ubyte 0, long 1
+	%P = getelementptr %crazy* %P1, long 0, long %idx, uint 0, long 1
 	ret sbyte *%P
 }
 sbyte *%mtest3(%crazy* %P1, long %idx) {    ; Merge array %crazy is in
-	%P = getelementptr %crazy* %P1, long %idx, long 0, ubyte 0, long 1
+	%P = getelementptr %crazy* %P1, long %idx, long 0, uint 0, long 1
 	ret sbyte *%P
 }
 
 sbyte *%m2test1(%crazy* %P1, long %idx) {    ; Merge two arrays
-	%P = getelementptr %crazy* %P1, long 0, long %idx, ubyte 0, long %idx
+	%P = getelementptr %crazy* %P1, long 0, long %idx, uint 0, long %idx
 	ret sbyte *%P
 }
 
diff --git a/test/Transforms/DSAnalysis/badcases.ll b/test/Transforms/DSAnalysis/badcases.ll
index efae6463c5..2c0689228b 100644
--- a/test/Transforms/DSAnalysis/badcases.ll
+++ b/test/Transforms/DSAnalysis/badcases.ll
@@ -15,7 +15,7 @@ void %test1({int, int} * %X) {
 void %test2({int, int} * %X) {
 	getelementptr {int, int} * %X, long 0
 	%Y = cast {int, int} * %X to {sbyte,sbyte,sbyte,sbyte,sbyte,sbyte,sbyte,sbyte} *
-	%Z = getelementptr {sbyte,sbyte,sbyte,sbyte,sbyte,sbyte,sbyte,sbyte}* %Y, long 0, ubyte 7
+	%Z = getelementptr {sbyte,sbyte,sbyte,sbyte,sbyte,sbyte,sbyte,sbyte}* %Y, long 0, uint 7
 	store sbyte 6, sbyte *%Z
 	ret void
 }
diff --git a/test/Transforms/DSAnalysis/basictest.ll b/test/Transforms/DSAnalysis/basictest.ll
index 8bcb2f8888..3191441bd8 100644
--- a/test/Transforms/DSAnalysis/basictest.ll
+++ b/test/Transforms/DSAnalysis/basictest.ll
@@ -11,7 +11,7 @@ int *%foo(ulong %A, double %B, long %C) {
 	store int* %E, int** %X
 
 	%F = malloc {int}
-	%G = getelementptr {int}* %F, long 0, ubyte 0
+	%G = getelementptr {int}* %F, long 0, uint 0
 	store int* %G, int** %X
 
 	%K = malloc int **
diff --git a/test/Transforms/DSAnalysis/fieldmerge.ll b/test/Transforms/DSAnalysis/fieldmerge.ll
index e59a2d1a17..a95fbdd432 100644
--- a/test/Transforms/DSAnalysis/fieldmerge.ll
+++ b/test/Transforms/DSAnalysis/fieldmerge.ll
@@ -8,10 +8,10 @@ implementation
 void %bar(%str* %S, bool %C) {
 	br bool %C, label %T, label %F
 T:
-	%A = getelementptr %str* %S, long 0, ubyte 0
+	%A = getelementptr %str* %S, long 0, uint 0
 	br label %Out
 F:
-	%B = getelementptr %str* %S, long 0, ubyte 1
+	%B = getelementptr %str* %S, long 0, uint 1
 	br label %Out
 Out:
 	%P = phi int** [%A, %T], [%B, %F]
diff --git a/test/Transforms/DSAnalysis/misctests.ll b/test/Transforms/DSAnalysis/misctests.ll
index 32aeb2bd32..0e01c6b7d2 100644
--- a/test/Transforms/DSAnalysis/misctests.ll
+++ b/test/Transforms/DSAnalysis/misctests.ll
@@ -50,9 +50,9 @@ L3:
 }
 
 int %test6({int, int}* %A) {
-	%B = getelementptr {int, int}* %A, long 0, ubyte 0
+	%B = getelementptr {int, int}* %A, long 0, uint 0
 	%b = load int* %B
-	%C = getelementptr {int, int}* %A, long 0, ubyte 1
+	%C = getelementptr {int, int}* %A, long 0, uint 1
 	%c = load int* %C
 	%d = add int %b, %c
 	ret int %d
diff --git a/test/Transforms/DSAnalysis/physicalsubtype.ll b/test/Transforms/DSAnalysis/physicalsubtype.ll
index d06a8d2a4e..e46dbdd4f4 100644
--- a/test/Transforms/DSAnalysis/physicalsubtype.ll
+++ b/test/Transforms/DSAnalysis/physicalsubtype.ll
@@ -6,10 +6,10 @@
 %DT = type { int, int*, int }       ; "derived type"
 
 int %test(%DT* %DT) {
-	%DTp = getelementptr %DT* %DT, long 0, ubyte 0
+	%DTp = getelementptr %DT* %DT, long 0, uint 0
 	%A = load int* %DTp
 	%ST = cast %DT* %DT to %ST*
-	%STp = getelementptr %ST* %ST, long 0, ubyte 0
+	%STp = getelementptr %ST* %ST, long 0, uint 0
 	%B = load int* %STp
 	%C = sub int %A, %B         ; A & B are equal, %C = 0
 	ret int %C
diff --git a/test/Transforms/DSAnalysis/structpadding.ll b/test/Transforms/DSAnalysis/structpadding.ll
index 2d6c2e33b4..f776b5c8e0 100644
--- a/test/Transforms/DSAnalysis/structpadding.ll
+++ b/test/Transforms/DSAnalysis/structpadding.ll
@@ -5,10 +5,10 @@
 implementation
 
 void %bar(%str* %S, %str* %T) {
-	%A1 = getelementptr %str* %S, long 0, ubyte 0
-	%B1 = getelementptr %str* %S, long 0, ubyte 1
-	%A2 = getelementptr %str* %S, long 0, ubyte 0
-	%B2 = getelementptr %str* %S, long 0, ubyte 1
+	%A1 = getelementptr %str* %S, long 0, uint 0
+	%B1 = getelementptr %str* %S, long 0, uint 1
+	%A2 = getelementptr %str* %S, long 0, uint 0
+	%B2 = getelementptr %str* %S, long 0, uint 1
 	%a1 = cast int* %A1 to long*
 	%a2 = cast int* %A2 to long*
 	%V = load long* %a1
diff --git a/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll b/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll
index 694dbc2217..8386dfa9a8 100644
--- a/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll
+++ b/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll
@@ -9,6 +9,6 @@
 implementation
 
 int* %test() {
-  %P = getelementptr {int}* %X, long 0, ubyte 0
+  %P = getelementptr {int}* %X, long 0, uint 0
   ret int* %P
 }
diff --git a/test/Transforms/GlobalOpt/memset.ll b/test/Transforms/GlobalOpt/memset.ll
index 442af9850c..ff6c421924 100644
--- a/test/Transforms/GlobalOpt/memset.ll
+++ b/test/Transforms/GlobalOpt/memset.ll
@@ -14,7 +14,7 @@ void %foo() {
         %Blah = alloca [58 x sbyte]             ; <[58 x sbyte]*> [#uses=2]
         %tmp3 = cast [58 x sbyte]* %Blah to sbyte*
 	call void %llvm.memcpy( sbyte* cast ([4 x int]* %G1 to sbyte*), sbyte* %tmp3, uint 16, uint 1)
- 	call void %llvm.memset( sbyte* getelementptr ([58 x sbyte]* %G0, int 0, int 0), ubyte 17, uint 58, uint 1)
+ 	call void %llvm.memset( sbyte* getelementptr ([58 x sbyte]* %G0, int 0, int 0), uint 17, uint 58, uint 1)
 	ret void
 }
 
diff --git a/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll b/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
index c632ac1413..db2b504339 100644
--- a/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
+++ b/test/Transforms/InstCombine/2002-09-17-GetElementPtrCrash.ll
@@ -5,7 +5,7 @@
 int %alias() {
     %pbob1 = alloca %bob
     %pbob2 = getelementptr %bob* %pbob1
-    %pbobel = getelementptr %bob* %pbob2, long 0, ubyte 0
+    %pbobel = getelementptr %bob* %pbob2, long 0, uint 0
     %rval = load int* %pbobel
     ret int %rval
 }
diff --git a/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll b/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll
index 0123126034..72f983bde1 100644
--- a/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll
+++ b/test/Transforms/InstCombine/2003-10-23-InstcombineNullFail.ll
@@ -7,7 +7,7 @@
 implementation
 
 bool %test() {
-	%A = getelementptr %X* null, long 0, ubyte 0, long 0
+	%A = getelementptr %X* null, long 0, uint 0, long 0
 	%B = setne int* %A, null
 	ret bool %B
 }
diff --git a/test/Transforms/InstCombine/getelementptr.ll b/test/Transforms/InstCombine/getelementptr.ll
index 79b951bf81..1d3efed50e 100644
--- a/test/Transforms/InstCombine/getelementptr.ll
+++ b/test/Transforms/InstCombine/getelementptr.ll
@@ -23,7 +23,7 @@ int* %foo3(int * %I) { ; Test that two array indexing geps fold
 
 int* %foo4({int} *%I) { ; Test that two getelementptr insts fold
 	%A = getelementptr {int}* %I, long 1
-	%B = getelementptr {int}* %A, long 0, ubyte 0
+	%B = getelementptr {int}* %A, long 0, uint 0
 	ret int* %B
 }
 
diff --git a/test/Transforms/InstCombine/load.ll b/test/Transforms/InstCombine/load.ll
index b87e76ec5b..6b3f4a68cd 100644
--- a/test/Transforms/InstCombine/load.ll
+++ b/test/Transforms/InstCombine/load.ll
@@ -15,20 +15,20 @@ int %test1() {
 }
 
 float %test2() {
-	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 1, ubyte 1
+	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 1, uint 1
 	%B = load float* %A
 	ret float %B
 }
 
 
 int %test3() {
-	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 0, ubyte 0
+	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 0, uint 0
 	%B = load int* %A
 	ret int %B
 }
 
 int %test4() {
-	%A = getelementptr [2 x { int, float}]* %Z, long 0, long 1, ubyte 0
+	%A = getelementptr [2 x { int, float}]* %Z, long 0, long 1, uint 0
 	%B = load int* %A
 	ret int %B
 }
diff --git a/test/Transforms/LICM/sink_multiple.ll b/test/Transforms/LICM/sink_multiple.ll
index 22ab9f9c13..a98a17fbd5 100644
--- a/test/Transforms/LICM/sink_multiple.ll
+++ b/test/Transforms/LICM/sink_multiple.ll
@@ -11,7 +11,7 @@
 int %test() {
         br label %Loop
 Loop:
-        %dead = getelementptr %Ty* %X, long 0, ubyte 0
+        %dead = getelementptr %Ty* %X, long 0, uint 0
         %sunk2 = load int* %dead
         br bool false, label %Loop, label %Out
 Out:
diff --git a/test/Transforms/LevelRaise/2002-03-20-Crash.ll b/test/Transforms/LevelRaise/2002-03-20-Crash.ll
index d23b22a4a9..bd5c18e32a 100644
--- a/test/Transforms/LevelRaise/2002-03-20-Crash.ll
+++ b/test/Transforms/LevelRaise/2002-03-20-Crash.ll
@@ -14,7 +14,7 @@ bb0:					;[#uses=1]
 	%A = cast %Village* %village to ulong
 	%reg123 = add ulong %A, %cast121		; <%Village *> [#uses=1]
 	%reg123 = cast ulong %reg123 to %Village*
-	%idx = getelementptr %Village * %reg123, long 0, ubyte 0, long 0		; <%Village *> [#uses=1]
+	%idx = getelementptr %Village * %reg123, long 0, uint 0, long 0		; <%Village *> [#uses=1]
 	%reg118 = load %Village** %idx
 	ret %Village *%reg118
 end
diff --git a/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll b/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
index 8e90bfa02c..7720f6bd42 100644
--- a/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
+++ b/test/Transforms/LevelRaise/2003-01-30-ShiftCrash.ll
@@ -12,7 +12,7 @@ bb22:           ; preds = %bb5
         br bool false, label %bb24, label %UnifiedExitNode
 
 bb24:           ; preds = %bb22
-        %reg399 = getelementptr { ubyte*, uint, ulong, ubyte*, uint, ulong, sbyte*, { \4, int, ubyte*, ulong, ubyte*, int, int, ubyte, ubyte, int, uint, uint, uint, ubyte*, ulong, ushort*, ushort*, uint, uint, uint, uint, uint, long, uint, uint, int, uint, uint, uint, uint, uint, uint, int, int, uint, int, [573 x { { ushort }, { ushort } }], [61 x { { ushort }, { ushort } }], [39 x { { ushort }, { ushort } }], { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, [16 x ushort], [573 x int], int, int, [573 x ubyte], ubyte*, uint, uint, ushort*, ulong, ulong, uint, int, ushort, int }*, sbyte* (sbyte*, uint, uint)*, void (sbyte*, sbyte*)*, sbyte*, int, ulong, ulong }* %reg107, long 0, ubyte 8              ; <sbyte* (sbyte*, uint, uint)**> [#uses=1]
+        %reg399 = getelementptr { ubyte*, uint, ulong, ubyte*, uint, ulong, sbyte*, { \4, int, ubyte*, ulong, ubyte*, int, int, ubyte, ubyte, int, uint, uint, uint, ubyte*, ulong, ushort*, ushort*, uint, uint, uint, uint, uint, long, uint, uint, int, uint, uint, uint, uint, uint, uint, int, int, uint, int, [573 x { { ushort }, { ushort } }], [61 x { { ushort }, { ushort } }], [39 x { { ushort }, { ushort } }], { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, { { { ushort }, { ushort } }*, int, { int }* }, [16 x ushort], [573 x int], int, int, [573 x ubyte], ubyte*, uint, uint, ushort*, ulong, ulong, uint, int, ushort, int }*, sbyte* (sbyte*, uint, uint)*, void (sbyte*, sbyte*)*, sbyte*, int, ulong, ulong }* %reg107, long 0, uint 8              ; <sbyte* (sbyte*, uint, uint)**> [#uses=1]
         %reg137 = load sbyte* (sbyte*, uint, uint)** %reg399            ; <sbyte* (sbyte*, uint, uint)*> [#uses=1]
         %reg402 = call sbyte* %reg137( sbyte* null, uint 0, uint 0 )            ; <sbyte*> [#uses=1]
         br bool false, label %bb26, label %UnifiedExitNode
diff --git a/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll b/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
index 0e9785ecd3..7a294ef46a 100644
--- a/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
+++ b/test/Transforms/LevelRaise/2003-06-07-EmptyArrayTest.ll
@@ -3,7 +3,7 @@
 %T = type { [0 x ubyte] }
 
 void %test(%T* %tmp.22) {
-	%tmp.23 = getelementptr %T* %tmp.22, long 0, ubyte 0
+	%tmp.23 = getelementptr %T* %tmp.22, long 0, uint 0
 	%tmp.24 = cast [0 x ubyte]* %tmp.23 to sbyte**
 	%tmp.25 = load sbyte** %tmp.24
 	ret void
diff --git a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
index 998f49719e..131ade06a1 100644
--- a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
+++ b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
@@ -9,7 +9,7 @@ target pointersize = 64
 
 implementation   ; Functions:
 bool %Intersection(%struct..istack_struct* %tmp.0, uint %tmp.12) {              ; No predecessors!
-        %tmp.8 = getelementptr %struct..istack_struct* %tmp.0, long 0, ubyte 1          ; <%struct..istk_entry**> [#uses=1]
+        %tmp.8 = getelementptr %struct..istack_struct* %tmp.0, long 0, uint 1          ; <%struct..istk_entry**> [#uses=1]
         %tmp.9 = load %struct..istk_entry** %tmp.8              ; <%struct..istk_entry*> [#uses=1]
         %dec = sub uint %tmp.12, 1              ; <uint> [#uses=1]
         %tmp.13 = cast uint %dec to ulong               ; <ulong> [#uses=1]
diff --git a/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll b/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll
index 0733b93242..aa1e4d4fef 100644
--- a/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll
+++ b/test/Transforms/LowerSetJmp/2003-11-05-DominanceProperties.ll
@@ -8,7 +8,7 @@ declare int %llvm.setjmp(int *)
 
 void %perl_call_sv() {
 	call void %Perl_sv_setpv( )
-	%tmp.335 = getelementptr %struct.jmpenv* null, long 0, ubyte 0
+	%tmp.335 = getelementptr %struct.jmpenv* null, long 0, uint 0
 	%tmp.336 = call int %llvm.setjmp( int* null )
 	store int %tmp.336, int* %tmp.335
 	ret void
diff --git a/test/Transforms/SCCP/loadtest.ll b/test/Transforms/SCCP/loadtest.ll
index cc9838c851..c663627c3d 100644
--- a/test/Transforms/SCCP/loadtest.ll
+++ b/test/Transforms/SCCP/loadtest.ll
@@ -12,13 +12,13 @@ int %test1() {
 }
 
 float %test2() {
-	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 1, ubyte 1
+	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 1, uint 1
 	%B = load float* %A
 	ret float %B
 }
 
 int %test3() {
-	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 0, ubyte 0
+	%A = getelementptr [2 x { int, float}]* %Y, long 0, long 0, uint 0
 	%B = load int* %A
 	ret int %B
 }
diff --git a/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll b/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
index 6ec9adb209..cda4403b9b 100644
--- a/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
+++ b/test/Transforms/ScalarRepl/2003-05-30-InvalidIndices.ll
@@ -2,6 +2,6 @@
 
 void %main() {
 	%E = alloca { { int, float, double, long }, { int, float, double, long } }		; <{ { int, float, double, long }, { int, float, double, long } }*> [#uses=1]
-	%tmp.151 = getelementptr { { int, float, double, long }, { int, float, double, long } }* %E, long 0, ubyte 1, ubyte 3		; <long*> [#uses=0]
+	%tmp.151 = getelementptr { { int, float, double, long }, { int, float, double, long } }* %E, long 0, uint 1, uint 3		; <long*> [#uses=0]
 	ret void
 }
diff --git a/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll b/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
index 958f33a2b3..afba5683de 100644
--- a/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
+++ b/test/Transforms/ScalarRepl/2003-05-30-MultiLevel.ll
@@ -2,7 +2,7 @@
 
 int %test() {
   %X = alloca { [ 4 x int] }
-  %Y = getelementptr { [ 4 x int] }* %X, long 0, ubyte 0, long 2
+  %Y = getelementptr { [ 4 x int] }* %X, long 0, uint 0, long 2
   store int 4, int* %Y
   %Z = load int* %Y
   ret int %Z
diff --git a/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll b/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
index 6e8dc39534..cfeff456b2 100644
--- a/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
+++ b/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
@@ -6,9 +6,9 @@ declare void %.iter_2(int (sbyte*)*, sbyte*)
 
 int %main() {
 	%d = alloca { [80 x sbyte], int, uint }
-	%tmp.0 = getelementptr { [80 x sbyte], int, uint }* %d, long 0, ubyte 2
+	%tmp.0 = getelementptr { [80 x sbyte], int, uint }* %d, long 0, uint 2
 	store uint 0, uint* %tmp.0
-	%tmp.1 = getelementptr { [80 x sbyte], int, uint }* %d, long 0, ubyte 0, long 0
+	%tmp.1 = getelementptr { [80 x sbyte], int, uint }* %d, long 0, uint 0, long 0
 	call void %.iter_2( int (sbyte*)* %.callback_1, sbyte* %tmp.1 )
 	ret int 0
 }
diff --git a/test/Transforms/ScalarRepl/basictest.ll b/test/Transforms/ScalarRepl/basictest.ll
index df27b09a88..53d60c99ae 100644
--- a/test/Transforms/ScalarRepl/basictest.ll
+++ b/test/Transforms/ScalarRepl/basictest.ll
@@ -2,7 +2,7 @@
 
 int %test() {
   %X = alloca { int, float }
-  %Y = getelementptr {int,float}* %X, long 0, ubyte 0
+  %Y = getelementptr {int,float}* %X, long 0, uint 0
   store int 0, int* %Y
 
   %Z = load int* %Y
diff --git a/test/Transforms/SimplifyCFG/switch_formation.ll b/test/Transforms/SimplifyCFG/switch_formation.ll
index f225e8dd0d..60169fe92d 100644
--- a/