final test_cases fixes for fastcomp

5 files changed, 35 insertions, 34 deletions

diff --git a/tests/cases/caall.ll b/tests/cases/caall.ll
index 5b8f7f29..2cc231ec 100644
--- a/tests/cases/caall.ll
+++ b/tests/cases/caall.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'tests/hello_world.bc'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
-target triple = "i386-pc-linux-gnu"
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
 
 @.str = private unnamed_addr constant [15 x i8] c"hello, world!\0A\00", align 1 ; [#uses=1 type=[15 x i8]*]
 
@@ -11,14 +11,14 @@ entry:
   store i32 0, i32* %retval
   %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0)) ; [#uses=0 type=i32]
   %call12 = call void (i32*)** @_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEPFvP6ObjectENS_4lessIS6_EENS4_INS_4pairIKS6_SA_EEEEEixERSE_(i32 10)
-  %26 = load void (%class.Object*)** %call12
+  %l26 = load void (i32*)** %call12
   ret i32 1
 }
 
-define (i32*)** @_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEPFvP6ObjectENS_4lessIS6_EENS4_INS_4pairIKS6_SA_EEEEEixERSE_(i32 %x) {
+define void (i32*)** @_ZNSt3__13mapINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEPFvP6ObjectENS_4lessIS6_EENS4_INS_4pairIKS6_SA_EEEEEixERSE_(i32 %x) {
 entry:
-  %ret = inttoptr i32 0 to (i32*)**
-  ret (i32*)** %ret
+  %ret = inttoptr i32 0 to void (i32*)**
+  ret void (i32*)** %ret
 }
 
 ; [#uses=1]
diff --git a/tests/cases/i24_mem_ta2.ll b/tests/cases/i24_mem_ta2.ll
index e50014ca..550389fe 100644
--- a/tests/cases/i24_mem_ta2.ll
+++ b/tests/cases/i24_mem_ta2.ll
@@ -1,8 +1,8 @@
 ; ModuleID = 'tests/hello_world.bc'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
-target triple = "i386-pc-linux-gnu"
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
 
-@.str = private unnamed_addr constant [15 x i8] c".%x.\0A\00", align 1 ; [#uses=1 type=[5 x i8]*]
+@.str = private unnamed_addr constant [6 x i8] c".%x.\0A\00", align 1 ; [#uses=1 type=[5 x i8]*]
 
 define i32 @main() {
 entry:
@@ -11,11 +11,11 @@ entry:
   %i24 = bitcast i32* %mem to i24*
   %load = load i24* %i24, align 4
   %load32 = zext i24 %load to i32
-  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([5 x i8]* @.str, i32 0, i32 0), i32 %load32)
+  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), i32 %load32)
   %val_24 = trunc i32 4041265344 to i24
   store i24 %val_24, i24* %i24, align 4
   %load32b = load i32* %mem, align 4
-  %call2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([5 x i8]* @.str, i32 0, i32 0), i32 %load32b)
+  %call2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), i32 %load32b)
   ret i32 1
 }
 
diff --git a/tests/cases/invokebitcast.ll b/tests/cases/invokebitcast.ll
index ffb5803f..ec090b0d 100644
--- a/tests/cases/invokebitcast.ll
+++ b/tests/cases/invokebitcast.ll
@@ -1,7 +1,7 @@
 ; ModuleID = '/dev/shm/tmp/src.cpp.o'
 ; Just test for compilation here
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-f128:128:128-n8:16:32"
-target triple = "i386-pc-linux-gnu"
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
 
 %struct.CPU_Regs = type { [8 x %union.GenReg32] }
 %union.GenReg32 = type { [1 x i32] }
@@ -16,7 +16,8 @@ entry:
   %0 = alloca i32                                 ; [#uses=2]
   %"alloca point" = bitcast i32 0 to i32          ; [#uses=0]
   %1 = load i32* bitcast (i32* getelementptr inbounds (%struct.CPU_Regs* @cpu_regs, i32 0, i32 0, i32 1, i32 0, i32 0) to i32*), align 2 ; [#uses=1]
-  store i16 %1, i16* bitcast (%struct.CPU_Regs* @cpu_regs to i16*), align 2
+  %s = trunc i32 %1 to i16
+  store i16 %s, i16* bitcast (%struct.CPU_Regs* @cpu_regs to i16*), align 2
   %2 = call i32 @puts(i8* getelementptr inbounds ([14 x i8]* @.str, i32 0, i32 0)) ; [#uses=0]
   store i32 0, i32* %0, align 4
   %3 = load i32* %0, align 4                      ; [#uses=1]
diff --git a/tests/cases/phientryimplicit.ll b/tests/cases/phientryimplicit.ll
index 8a510f43..b7b17add 100644
--- a/tests/cases/phientryimplicit.ll
+++ b/tests/cases/phientryimplicit.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'tests/hello_world.bc'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
-target triple = "i386-pc-linux-gnu"
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
 
 ; Phi nodes can refer to the entry. And the entry might be unnamed, and doesn't even have a consistent implicit name!
 
@@ -9,35 +9,35 @@ target triple = "i386-pc-linux-gnu"
 ; [#uses=0]
 define i32 @main() {
   %retval = alloca i32, align 4                   ; [#uses=1 type=i32*]
-  %16 = trunc i32 1 to i1
-  br i1 %16, label %17, label %26, !dbg !1269853  ; [debug line = 3920:5]
+  %a16 = trunc i32 1 to i1
+  br i1 %a16, label %L17, label %L26, !dbg !1269853  ; [debug line = 3920:5]
 
-; <label>:17                                      ; preds = %1
-  %25 = trunc i32 1 to i1
-  br label %26
+L17:
+  %a25 = trunc i32 1 to i1
+  br label %L26
 
-; <label>:26                                      ; preds = %17, %1
-  %27 = phi i1 [ false, %1 ], [ %25, %17 ]        ; [#uses=1 type=i1]
+L26:
+  %a27 = phi i1 [ false, %1 ], [ %25, %L17 ]        ; [#uses=1 type=i1]
   store i32 0, i32* %retval
   %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0)) ; [#uses=0 type=i32]
-  %cal2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0), i32 %27) ; make sure %27 is used
+  %cal2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0), i1 %a27) ; make sure %27 is used
   ret i32 1
 }
 
 define i32 @main0() {
   %retval = alloca i32, align 4                   ; [#uses=1 type=i32*]
-  %16 = trunc i32 1 to i1
-  br i1 %16, label %17, label %26, !dbg !1269853  ; [debug line = 3920:5]
+  %a16 = trunc i32 1 to i1
+  br i1 %a16, label %L17, label %L26, !dbg !1269853  ; [debug line = 3920:5]
 
-; <label>:17                                      ; preds = %1
-  %25 = trunc i32 1 to i1
-  br label %26
+L17:
+  %a25 = trunc i32 1 to i1
+  br label %L26
 
-; <label>:26                                      ; preds = %17, %1
-  %27 = phi i1 [ false, %0 ], [ %25, %17 ]        ; [#uses=1 type=i1]
+L26:
+  %a27 = phi i1 [ false, %0 ], [ %25, %L17 ]        ; [#uses=1 type=i1]
   store i32 0, i32* %retval
   %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0)) ; [#uses=0 type=i32]
-  %cal2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0), i32 %27) ; make sure %27 is used
+  %cal2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0), i1 %a27) ; make sure %27 is used
   ret i32 1
 }
 
diff --git a/tests/cases/phiself.ll b/tests/cases/phiself.ll
index 81249799..0a06fcca 100644
--- a/tests/cases/phiself.ll
+++ b/tests/cases/phiself.ll
@@ -1,6 +1,6 @@
 ; ModuleID = '/tmp/emscripten_temp/src.cpp.o'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
-target triple = "i386-pc-linux-gnu"
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
 
 @.str = private unnamed_addr constant [7 x i8] c"cheez\0A\00", align 1
 @.str1 = private unnamed_addr constant [6 x i8] c"*%d*\0A\00", align 1