1 files changed, 31 insertions, 40 deletions
diff --git a/test/Feature/testmemory.ll b/test/Feature/testmemory.ll
index ce48e57606..a9019f0bd3 100644
--- a/test/Feature/testmemory.ll
+++ b/test/Feature/testmemory.ll
@@ -1,45 +1,36 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > %t1.ll
+; RUN: llvm-as < %s | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-%struct = type { int , {float, {ubyte } } , ulong }
-%complexty = type {int, {[4 x sbyte *], float}, double}
 
-implementation
-
-int "main"()
-begin
-  call int %testfunction(long 0, long 1)
-  ret int 0
-end
-
-int "testfunction"(long %i0, long %j0)
-begin
-    %array0 = malloc [4 x ubyte]            ; yields {[4 x ubyte]*}:array0
-    %size   = add uint 2, 2                 ; yields {uint}:size = uint %4
-    %array1 = malloc ubyte, uint 4          ; yields {ubyte*}:array1
-    %array2 = malloc ubyte, uint %size      ; yields {ubyte*}:array2
-
-    %idx = getelementptr [4 x ubyte]* %array0, long 0, long 2
-    store ubyte 123, ubyte* %idx
-    free [4x ubyte]* %array0
-    free ubyte* %array1
-    free ubyte* %array2
-
-
-    %aa = alloca %complexty, uint 5
-    %idx2 = getelementptr %complexty* %aa, long %i0, uint 1, uint 0, long %j0
-    store sbyte *null, sbyte** %idx2
-    
-    %ptr = alloca int                       ; yields {int*}:ptr
-    store int 3, int* %ptr                  ; yields {void}
-    %val = load int* %ptr                   ; yields {int}:val = int %3
-
-    %sptr = alloca %struct                  ; yields {%struct*}:sptr
-    %ubsptr = getelementptr %struct * %sptr, long 0, uint 1, uint 1  ; yields {{ubyte}*}:ubsptr
-    %idx3 = getelementptr {ubyte} * %ubsptr, long 0, uint 0
-    store ubyte 4, ubyte* %idx3
-
-    ret int 3
-end
+        %complexty = type { i32, { [4 x i8*], float }, double }
+        %struct = type { i32, { float, { i8 } }, i64 }
+
+define i32 @main() {
+        call i32 @testfunction( i64 0, i64 1 )          ; <i32>:1 [#uses=0]
+        ret i32 0
+}
+
+define i32 @testfunction(i64 %i0, i64 %j0) {
+        %array0 = malloc [4 x i8]               ; <[4 x i8]*> [#uses=2]
+        %size = add i32 2, 2            ; <i32> [#uses=1]
+        %array1 = malloc i8, i32 4              ; <i8*> [#uses=1]
+        %array2 = malloc i8, i32 %size          ; <i8*> [#uses=1]
+        %idx = getelementptr [4 x i8]* %array0, i64 0, i64 2            ; <i8*> [#uses=1]
+        store i8 123, i8* %idx
+        free [4 x i8]* %array0
+        free i8* %array1
+        free i8* %array2
+        %aa = alloca %complexty, i32 5          ; <%complexty*> [#uses=1]
+        %idx2 = getelementptr %complexty* %aa, i64 %i0, i32 1, i32 0, i64 %j0           ; <i8**> [#uses=1]
+        store i8* null, i8** %idx2
+        %ptr = alloca i32               ; <i32*> [#uses=2]
+        store i32 3, i32* %ptr
+        %val = load i32* %ptr           ; <i32> [#uses=0]
+        %sptr = alloca %struct          ; <%struct*> [#uses=1]
+        %ubsptr = getelementptr %struct* %sptr, i64 0, i32 1, i32 1             ; <{ i8 }*> [#uses=1]
+        %idx3 = getelementptr { i8 }* %ubsptr, i64 0, i32 0             ; <i8*> [#uses=1]
+        store i8 4, i8* %idx3
+        ret i32 3
+}