7 files changed, 19 insertions, 19 deletions
diff --git a/test/Transforms/DSAnalysis/arraytest.ll b/test/Transforms/DSAnalysis/arraytest.ll
index 0484341..19410ef 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 efae646..2c06892 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 8bcb2f8..3191441 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 e59a2d1..a95fbdd 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 32aeb2b..0e01c6b 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 d06a8d2..e46dbdd 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 2d6c2e3..f776b5c 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