diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2016-09-28 13:10:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 13:10:59 -0700 |
| commit | 2da1b20451a744daa613e818f71e8f52de3a818e (patch) | |
| tree | 62632269da091888b428b003c0ae703aa27ee2b3 /test | |
| parent | ef22ce6c360b70b5bfad40b2930c481d48ed9780 (diff) | |
| download | binaryen-2da1b20451a744daa613e818f71e8f52de3a818e.tar.gz binaryen-2da1b20451a744daa613e818f71e8f52de3a818e.tar.bz2 binaryen-2da1b20451a744daa613e818f71e8f52de3a818e.zip | |
Type check block/loop/if sigs (#717)
* type check using block/loop/if types provided in text and binary formats.
* print if and loop sigs which were missing.
* remove dsl from OptimizeInstructions as after those changes it needs rethinking.
Diffstat (limited to 'test')
34 files changed, 770 insertions, 758 deletions
diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm index 624cd3fd1..52e27d130 100644 --- a/test/emcc_O2_hello_world.fromasm +++ b/test/emcc_O2_hello_world.fromasm @@ -1437,14 +1437,14 @@ (i32.load offset=480 (i32.shl (tee_local $8 - (if + (if i32 (tee_local $13 (i32.shr_u (get_local $0) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $2) (i32.const 16777215) @@ -1716,7 +1716,7 @@ ) (if (tee_local $0 - (if + (if i32 (i32.and (i32.eqz (get_local $5) @@ -2469,14 +2469,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $10 (i32.shr_u (get_local $4) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $4) (i32.const 16777215) @@ -3122,7 +3122,7 @@ ) ) (if - (if + (if i32 (i32.ne (tee_local $3 (i32.load @@ -3157,8 +3157,8 @@ ) ) (if - (if - (if + (if i32 + (if i32 (select (i32.lt_u (get_local $4) @@ -3168,7 +3168,7 @@ (i32.eq (tee_local $6 (block $label$break$L257 i32 - (if + (if i32 (i32.and (i32.load (i32.const 620) @@ -3191,7 +3191,7 @@ (loop $while-in$38 (block $while-out$37 (if - (if + (if i32 (i32.le_u (tee_local $26 (i32.load @@ -3308,7 +3308,7 @@ ) (block $do-once$39 (if - (if + (if i32 (i32.eq (get_local $6) (i32.const 173) @@ -3325,7 +3325,7 @@ ) (block (set_local $0 - (if + (if i32 (i32.and (tee_local $9 (i32.add @@ -3456,7 +3456,7 @@ ) ) (if - (if + (if i32 (i32.and (i32.gt_u (get_local $15) @@ -3812,7 +3812,7 @@ ) ) (set_local $17 - (if + (if i32 (i32.lt_u (get_local $20) (tee_local $18 @@ -4028,7 +4028,7 @@ (i32.store (tee_local $5 (i32.add - (if + (if i32 (i32.eq (i32.and (tee_local $0 @@ -4670,7 +4670,7 @@ (i32.shl (tee_local $3 (block $do-once$67 i32 - (if + (if i32 (tee_local $2 (i32.shr_u (get_local $15) @@ -5052,7 +5052,7 @@ ) (loop $while-in$72 (if - (if + (if i32 (i32.le_u (tee_local $1 (i32.load @@ -5410,14 +5410,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $18 (i32.shr_u (get_local $1) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $1) (i32.const 16777215) @@ -7426,14 +7426,14 @@ (i32.const 480) (i32.shl (tee_local $7 - (if + (if i32 (tee_local $1 (i32.shr_u (get_local $0) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const 16777215) @@ -7906,7 +7906,7 @@ (i32.eq (get_local $3) (tee_local $6 - (if + (if i32 (i32.load (i32.const 8) ) @@ -7998,7 +7998,7 @@ ) ) (set_local $5 - (if + (if i32 (i32.le_u (get_local $6) (tee_local $14 @@ -8007,7 +8007,7 @@ ) ) ) - (if + (if i32 (i32.eq (get_local $4) (i32.const 2) @@ -8277,7 +8277,7 @@ ) (set_local $1 (block $label$break$L10 i32 - (if + (if i32 (i32.gt_s (i32.load8_s offset=75 (get_local $2) @@ -8409,7 +8409,7 @@ (local $1 i32) (local $2 i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -8437,7 +8437,7 @@ (get_local $0) ) ) - (if + (if i32 (get_local $1) (get_local $2) (block i32 @@ -8450,7 +8450,7 @@ ) (block i32 (set_local $0 - (if + (if i32 (i32.load (i32.const 56) ) @@ -8480,7 +8480,7 @@ ) (loop $while-in$3 (set_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $1) @@ -8494,7 +8494,7 @@ ) ) (set_local $2 - (if + (if i32 (i32.gt_u (i32.load offset=20 (get_local $1) @@ -8767,7 +8767,7 @@ ) (block (if - (if + (if i32 (i32.lt_u (tee_local $2 (i32.load @@ -8813,7 +8813,7 @@ ) ) (set_local $4 - (if + (if i32 (i32.eq (call_indirect $FUNCSIG$iiii (get_local $0) @@ -8852,8 +8852,8 @@ (local $4 i32) (local $5 i32) (local $6 i32) - (if - (if + (if i32 + (if i32 (i32.gt_u (i32.load (tee_local $1 @@ -9262,7 +9262,7 @@ (local $3 i32) (local $4 i32) (set_local $3 - (if + (if i32 (i32.gt_s (i32.load offset=76 (tee_local $1 @@ -9281,7 +9281,7 @@ ) (set_local $0 (block $do-once$0 i32 - (if + (if i32 (i32.lt_s (call $_fputs (get_local $0) @@ -9292,7 +9292,7 @@ (i32.const 1) (block i32 (if - (if + (if i32 (i32.ne (i32.load8_s offset=75 (get_local $1) @@ -9400,7 +9400,7 @@ (get_local $2) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $___syscall_ret (call $___syscall140 @@ -9450,7 +9450,7 @@ (get_local $2) ) ) - (if + (if i32 (i32.and (tee_local $2 (i32.load @@ -9512,10 +9512,10 @@ (get_local $1) ) ) - (if + (if i32 (i32.eq (tee_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $3) @@ -9537,7 +9537,7 @@ (get_local $3) ) ) - (if + (if i32 (get_local $5) (get_local $0) (block i32 @@ -9584,7 +9584,7 @@ (i32.const 5) ) (if - (if + (if i32 (i32.and (i32.load (get_local $0) @@ -9746,7 +9746,7 @@ ) ) (func $___syscall_ret (param $0 i32) (result i32) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const -4096) @@ -9801,7 +9801,7 @@ (get_local $1) ) (func $___errno_location (result i32) - (if + (if i32 (i32.load (i32.const 8) ) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise index 7b84b9c38..2f37483de 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise +++ b/test/emcc_O2_hello_world.fromasm.imprecise @@ -1435,14 +1435,14 @@ (i32.load offset=480 (i32.shl (tee_local $8 - (if + (if i32 (tee_local $13 (i32.shr_u (get_local $0) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $2) (i32.const 16777215) @@ -1714,7 +1714,7 @@ ) (if (tee_local $0 - (if + (if i32 (i32.and (i32.eqz (get_local $5) @@ -2467,14 +2467,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $10 (i32.shr_u (get_local $4) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $4) (i32.const 16777215) @@ -3120,7 +3120,7 @@ ) ) (if - (if + (if i32 (i32.ne (tee_local $3 (i32.load @@ -3155,8 +3155,8 @@ ) ) (if - (if - (if + (if i32 + (if i32 (select (i32.lt_u (get_local $4) @@ -3166,7 +3166,7 @@ (i32.eq (tee_local $6 (block $label$break$L257 i32 - (if + (if i32 (i32.and (i32.load (i32.const 620) @@ -3189,7 +3189,7 @@ (loop $while-in$38 (block $while-out$37 (if - (if + (if i32 (i32.le_u (tee_local $26 (i32.load @@ -3306,7 +3306,7 @@ ) (block $do-once$39 (if - (if + (if i32 (i32.eq (get_local $6) (i32.const 173) @@ -3323,7 +3323,7 @@ ) (block (set_local $0 - (if + (if i32 (i32.and (tee_local $9 (i32.add @@ -3454,7 +3454,7 @@ ) ) (if - (if + (if i32 (i32.and (i32.gt_u (get_local $15) @@ -3810,7 +3810,7 @@ ) ) (set_local $17 - (if + (if i32 (i32.lt_u (get_local $20) (tee_local $18 @@ -4026,7 +4026,7 @@ (i32.store (tee_local $5 (i32.add - (if + (if i32 (i32.eq (i32.and (tee_local $0 @@ -4668,7 +4668,7 @@ (i32.shl (tee_local $3 (block $do-once$67 i32 - (if + (if i32 (tee_local $2 (i32.shr_u (get_local $15) @@ -5050,7 +5050,7 @@ ) (loop $while-in$72 (if - (if + (if i32 (i32.le_u (tee_local $1 (i32.load @@ -5408,14 +5408,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $18 (i32.shr_u (get_local $1) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $1) (i32.const 16777215) @@ -7424,14 +7424,14 @@ (i32.const 480) (i32.shl (tee_local $7 - (if + (if i32 (tee_local $1 (i32.shr_u (get_local $0) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const 16777215) @@ -7904,7 +7904,7 @@ (i32.eq (get_local $3) (tee_local $6 - (if + (if i32 (i32.load (i32.const 8) ) @@ -7996,7 +7996,7 @@ ) ) (set_local $5 - (if + (if i32 (i32.le_u (get_local $6) (tee_local $14 @@ -8005,7 +8005,7 @@ ) ) ) - (if + (if i32 (i32.eq (get_local $4) (i32.const 2) @@ -8275,7 +8275,7 @@ ) (set_local $1 (block $label$break$L10 i32 - (if + (if i32 (i32.gt_s (i32.load8_s offset=75 (get_local $2) @@ -8407,7 +8407,7 @@ (local $1 i32) (local $2 i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -8435,7 +8435,7 @@ (get_local $0) ) ) - (if + (if i32 (get_local $1) (get_local $2) (block i32 @@ -8448,7 +8448,7 @@ ) (block i32 (set_local $0 - (if + (if i32 (i32.load (i32.const 56) ) @@ -8478,7 +8478,7 @@ ) (loop $while-in$3 (set_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $1) @@ -8492,7 +8492,7 @@ ) ) (set_local $2 - (if + (if i32 (i32.gt_u (i32.load offset=20 (get_local $1) @@ -8765,7 +8765,7 @@ ) (block (if - (if + (if i32 (i32.lt_u (tee_local $2 (i32.load @@ -8811,7 +8811,7 @@ ) ) (set_local $4 - (if + (if i32 (i32.eq (call_indirect $FUNCSIG$iiii (get_local $0) @@ -8850,8 +8850,8 @@ (local $4 i32) (local $5 i32) (local $6 i32) - (if - (if + (if i32 + (if i32 (i32.gt_u (i32.load (tee_local $1 @@ -9260,7 +9260,7 @@ (local $3 i32) (local $4 i32) (set_local $3 - (if + (if i32 (i32.gt_s (i32.load offset=76 (tee_local $1 @@ -9279,7 +9279,7 @@ ) (set_local $0 (block $do-once$0 i32 - (if + (if i32 (i32.lt_s (call $_fputs (get_local $0) @@ -9290,7 +9290,7 @@ (i32.const 1) (block i32 (if - (if + (if i32 (i32.ne (i32.load8_s offset=75 (get_local $1) @@ -9398,7 +9398,7 @@ (get_local $2) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $___syscall_ret (call $___syscall140 @@ -9448,7 +9448,7 @@ (get_local $2) ) ) - (if + (if i32 (i32.and (tee_local $2 (i32.load @@ -9510,10 +9510,10 @@ (get_local $1) ) ) - (if + (if i32 (i32.eq (tee_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $3) @@ -9535,7 +9535,7 @@ (get_local $3) ) ) - (if + (if i32 (get_local $5) (get_local $0) (block i32 @@ -9582,7 +9582,7 @@ (i32.const 5) ) (if - (if + (if i32 (i32.and (i32.load (get_local $0) @@ -9744,7 +9744,7 @@ ) ) (func $___syscall_ret (param $0 i32) (result i32) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const -4096) @@ -9799,7 +9799,7 @@ (get_local $1) ) (func $___errno_location (result i32) - (if + (if i32 (i32.load (i32.const 8) ) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts index 0a5967f3e..13406a17d 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts @@ -180,7 +180,7 @@ ) (block (set_local $i2 - (if + (if i32 (i32.lt_u (get_local $i1) (i32.const 11) @@ -983,7 +983,7 @@ ) ) (set_local $i5 - (if + (if i32 (get_local $i15) (get_local $i10) (get_local $i5) @@ -993,7 +993,7 @@ (get_local $i23) ) (set_local $i7 - (if + (if i32 (get_local $i15) (get_local $i23) (get_local $i7) @@ -1848,7 +1848,7 @@ (set_local $i7 (i32.shl (get_local $i5) - (if + (if i32 (i32.eq (get_local $i32) (i32.const 31) @@ -1958,7 +1958,7 @@ ) ) (set_local $i16 - (if + (if i32 (i32.or (i32.eq (get_local $i9) @@ -2248,14 +2248,14 @@ ) ) (set_local $i3 - (if + (if i32 (get_local $i7) (get_local $i8) (get_local $i37) ) ) (set_local $i8 - (if + (if i32 (get_local $i7) (get_local $i38) (get_local $i39) @@ -2325,7 +2325,7 @@ ) ) (if - (if + (if i32 (i32.ne (get_local $i44) (i32.const 0) @@ -3135,7 +3135,7 @@ (set_local $i4 (i32.shl (get_local $i43) - (if + (if i32 (i32.eq (get_local $i52) (i32.const 31) @@ -3721,7 +3721,7 @@ ) ) (if - (if + (if i32 (i32.ne (get_local $i52) (i32.const 0) @@ -3793,7 +3793,7 @@ ) ) (if - (if + (if i32 (i32.le_u (get_local $i51) (get_local $i52) @@ -3923,7 +3923,7 @@ ) (block $do-once$39 (if - (if + (if i32 (i32.eq (get_local $i36) (i32.const 173) @@ -4014,7 +4014,7 @@ ) ) (if - (if + (if i32 (i32.ne (get_local $i45) (i32.const 0) @@ -4087,7 +4087,7 @@ ) (block $do-once$42 (if - (if + (if i32 (i32.and (i32.gt_u (get_local $i53) @@ -4204,9 +4204,9 @@ ) ) (if - (if - (if - (if + (if i32 + (if i32 + (if i32 (i32.eq (get_local $i36) (i32.const 190) @@ -4382,8 +4382,8 @@ ) ) (if - (if - (if + (if i32 + (if i32 (i32.eq (get_local $i36) (i32.const 203) @@ -4429,7 +4429,7 @@ ) ) (set_local $i44 - (if + (if i32 (i32.eq (i32.and (get_local $i63) @@ -4623,7 +4623,7 @@ (set_local $i44 (i32.add (get_local $i58) - (if + (if i32 (i32.eq (i32.and (get_local $i63) @@ -4651,7 +4651,7 @@ (set_local $i43 (i32.add (get_local $i61) - (if + (if i32 (i32.eq (i32.and (get_local $i63) @@ -5728,7 +5728,7 @@ (set_local $i50 (i32.shl (get_local $i79) - (if + (if i32 (i32.eq (get_local $i82) (i32.const 31) @@ -5994,7 +5994,7 @@ ) ) (if - (if + (if i32 (i32.le_u (get_local $i63) (get_local $i60) @@ -6051,7 +6051,7 @@ (set_local $i63 (i32.add (get_local $i44) - (if + (if i32 (i32.eq (i32.and (get_local $i53) @@ -6077,7 +6077,7 @@ ) ) (set_local $i44 - (if + (if i32 (i32.lt_u (get_local $i63) (get_local $i53) @@ -6099,7 +6099,7 @@ ) ) (set_local $i61 - (if + (if i32 (i32.eq (i32.and (get_local $i43) @@ -6600,7 +6600,7 @@ (set_local $i5 (i32.shl (get_local $i63) - (if + (if i32 (i32.eq (get_local $i89) (i32.const 31) @@ -6911,7 +6911,7 @@ ) ) (set_local $i62 - (if + (if i32 (i32.eq (i32.and (get_local $i5) @@ -8945,7 +8945,7 @@ (set_local $i31 (i32.shl (get_local $i29) - (if + (if i32 (i32.eq (get_local $i32) (i32.const 31) @@ -10464,7 +10464,7 @@ ) ) (if - (if + (if i32 (i32.lt_u (get_local $i6) (get_local $i8) @@ -10567,7 +10567,7 @@ ) ) (if - (if + (if i32 (i32.gt_u (i32.load (get_local $i2) @@ -11062,7 +11062,7 @@ ) (block (if - (if + (if i32 (i32.ne (i32.load8_s (i32.add @@ -11449,7 +11449,7 @@ (i32.const 5) ) (if - (if + (if i32 (i32.eq (i32.and (i32.load diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts index f40a19522..258448375 100644 --- a/test/emcc_O2_hello_world.fromasm.no-opts +++ b/test/emcc_O2_hello_world.fromasm.no-opts @@ -181,7 +181,7 @@ ) (block (set_local $i2 - (if + (if i32 (i32.lt_u (get_local $i1) (i32.const 11) @@ -984,7 +984,7 @@ ) ) (set_local $i5 - (if + (if i32 (get_local $i15) (get_local $i10) (get_local $i5) @@ -994,7 +994,7 @@ (get_local $i23) ) (set_local $i7 - (if + (if i32 (get_local $i15) (get_local $i23) (get_local $i7) @@ -1849,7 +1849,7 @@ (set_local $i7 (i32.shl (get_local $i5) - (if + (if i32 (i32.eq (get_local $i32) (i32.const 31) @@ -1959,7 +1959,7 @@ ) ) (set_local $i16 - (if + (if i32 (i32.or (i32.eq (get_local $i9) @@ -2249,14 +2249,14 @@ ) ) (set_local $i3 - (if + (if i32 (get_local $i7) (get_local $i8) (get_local $i37) ) ) (set_local $i8 - (if + (if i32 (get_local $i7) (get_local $i38) (get_local $i39) @@ -2326,7 +2326,7 @@ ) ) (if - (if + (if i32 (i32.ne (get_local $i44) (i32.const 0) @@ -3136,7 +3136,7 @@ (set_local $i4 (i32.shl (get_local $i43) - (if + (if i32 (i32.eq (get_local $i52) (i32.const 31) @@ -3722,7 +3722,7 @@ ) ) (if - (if + (if i32 (i32.ne (get_local $i52) (i32.const 0) @@ -3794,7 +3794,7 @@ ) ) (if - (if + (if i32 (i32.le_u (get_local $i51) (get_local $i52) @@ -3924,7 +3924,7 @@ ) (block $do-once$39 (if - (if + (if i32 (i32.eq (get_local $i36) (i32.const 173) @@ -4015,7 +4015,7 @@ ) ) (if - (if + (if i32 (i32.ne (get_local $i45) (i32.const 0) @@ -4088,7 +4088,7 @@ ) (block $do-once$42 (if - (if + (if i32 (i32.and (i32.gt_u (get_local $i53) @@ -4205,9 +4205,9 @@ ) ) (if - (if - (if - (if + (if i32 + (if i32 + (if i32 (i32.eq (get_local $i36) (i32.const 190) @@ -4383,8 +4383,8 @@ ) ) (if - (if - (if + (if i32 + (if i32 (i32.eq (get_local $i36) (i32.const 203) @@ -4430,7 +4430,7 @@ ) ) (set_local $i44 - (if + (if i32 (i32.eq (i32.and (get_local $i63) @@ -4624,7 +4624,7 @@ (set_local $i44 (i32.add (get_local $i58) - (if + (if i32 (i32.eq (i32.and (get_local $i63) @@ -4652,7 +4652,7 @@ (set_local $i43 (i32.add (get_local $i61) - (if + (if i32 (i32.eq (i32.and (get_local $i63) @@ -5729,7 +5729,7 @@ (set_local $i50 (i32.shl (get_local $i79) - (if + (if i32 (i32.eq (get_local $i82) (i32.const 31) @@ -5995,7 +5995,7 @@ ) ) (if - (if + (if i32 (i32.le_u (get_local $i63) (get_local $i60) @@ -6052,7 +6052,7 @@ (set_local $i63 (i32.add (get_local $i44) - (if + (if i32 (i32.eq (i32.and (get_local $i53) @@ -6078,7 +6078,7 @@ ) ) (set_local $i44 - (if + (if i32 (i32.lt_u (get_local $i63) (get_local $i53) @@ -6100,7 +6100,7 @@ ) ) (set_local $i61 - (if + (if i32 (i32.eq (i32.and (get_local $i43) @@ -6601,7 +6601,7 @@ (set_local $i5 (i32.shl (get_local $i63) - (if + (if i32 (i32.eq (get_local $i89) (i32.const 31) @@ -6912,7 +6912,7 @@ ) ) (set_local $i62 - (if + (if i32 (i32.eq (i32.and (get_local $i5) @@ -8946,7 +8946,7 @@ (set_local $i31 (i32.shl (get_local $i29) - (if + (if i32 (i32.eq (get_local $i32) (i32.const 31) @@ -10465,7 +10465,7 @@ ) ) (if - (if + (if i32 (i32.lt_u (get_local $i6) (get_local $i8) @@ -10568,7 +10568,7 @@ ) ) (if - (if + (if i32 (i32.gt_u (i32.load (get_local $i2) @@ -11063,7 +11063,7 @@ ) (block (if - (if + (if i32 (i32.ne (i32.load8_s (i32.add @@ -11450,7 +11450,7 @@ (i32.const 5) ) (if - (if + (if i32 (i32.eq (i32.and (i32.load diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index f2074155b..e6d2ce43e 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -311,7 +311,7 @@ ) (i32.store (get_local $1) - (if + (if i32 (f64.ne (get_local $0) (f64.const 0) @@ -489,7 +489,7 @@ (get_local $5) ) (func $___errno_location (result i32) - (if + (if i32 (i32.load (i32.const 16) ) @@ -669,7 +669,7 @@ (get_local $2) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $___syscall_ret (call $___syscall140 @@ -700,7 +700,7 @@ (local $1 i32) (local $2 i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -728,7 +728,7 @@ (get_local $0) ) ) - (if + (if i32 (get_local $2) (get_local $1) (block i32 @@ -741,7 +741,7 @@ ) (block i32 (set_local $0 - (if + (if i32 (i32.load (i32.const 12) ) @@ -764,7 +764,7 @@ ) (loop $while-in$3 (set_local $2 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $1) @@ -778,7 +778,7 @@ ) ) (set_local $0 - (if + (if i32 (i32.gt_u (i32.load offset=20 (get_local $1) @@ -977,7 +977,7 @@ (i32.eq (get_local $11) (tee_local $5 - (if + (if i32 (i32.load (i32.const 16) ) @@ -1053,7 +1053,7 @@ ) ) (set_local $1 - (if + (if i32 (i32.gt_u (get_local $5) (tee_local $12 @@ -1097,7 +1097,7 @@ (get_local $1) ) ) - (if + (if i32 (i32.eq (get_local $4) (i32.const 2) @@ -1301,7 +1301,7 @@ ) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $_printf_core (i32.const 0) @@ -1315,7 +1315,7 @@ (i32.const -1) (block i32 (set_local $12 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $0) @@ -1356,7 +1356,7 @@ (set_local $2 (select (i32.const -1) - (if + (if i32 (i32.load (tee_local $10 (i32.add @@ -1430,7 +1430,7 @@ (get_local $9) ) ) - (if + (if i32 (get_local $2) (block i32 (drop @@ -1596,7 +1596,7 @@ (drop (call $_memcpy (block $label$break$L10 i32 - (if + (if i32 (i32.gt_s (i32.load8_s offset=75 (get_local $2) @@ -1738,7 +1738,7 @@ (i32.const 255) ) ) - (if + (if i32 (i32.and (tee_local $1 (i32.load @@ -1793,7 +1793,7 @@ ) (func $_wcrtomb (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -1913,7 +1913,7 @@ ) ) ) - (if + (if i32 (i32.lt_u (i32.add (get_local $1) @@ -1996,7 +1996,7 @@ ) ) (func $_wctomb (param $0 i32) (param $1 i32) (result i32) - (if + (if i32 (get_local $0) (call $_wcrtomb (get_local $0) @@ -2254,7 +2254,7 @@ ) ) (func $___syscall_ret (param $0 i32) (result i32) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const -4096) @@ -2606,12 +2606,12 @@ (loop $label$continue$L1 (block $label$break$L1 (set_local $15 - (if + (if i32 (i32.gt_s (get_local $15) (i32.const -1) ) - (if + (if i32 (i32.gt_s (get_local $5) (i32.sub @@ -2807,7 +2807,7 @@ ) ) (set_local $21 - (if + (if i32 (i32.lt_u (tee_local $9 (i32.add @@ -3124,7 +3124,7 @@ ) ) (set_local $8 - (if + (if i32 (i32.lt_s (get_local $7) (i32.const 0) @@ -3251,7 +3251,7 @@ ) (set_local $9 (block $label$break$L46 i32 - (if + (if i32 (i32.eq (i32.load8_s (get_local $10) @@ -3423,7 +3423,7 @@ (br $label$break$L1) ) ) - (if + (if i32 (get_local $33) (block i32 (set_local $7 @@ -4264,7 +4264,7 @@ (get_local $14) ) (set_local $36 - (if + (if i32 (i32.lt_s (i32.load offset=4 (get_global $tempDoublePtr) @@ -4282,7 +4282,7 @@ ) (i32.const 4108) ) - (if + (if i32 (i32.and (get_local $10) (i32.const 2048) @@ -4320,7 +4320,7 @@ ) (set_local $5 (block $do-once$56 i32 - (if + (if i32 (i32.or (i32.lt_u (tee_local $5 @@ -4400,7 +4400,7 @@ ) ) (set_local $14 - (if + (if f64 (i32.or (i32.gt_u (get_local $7) @@ -4468,7 +4468,7 @@ (i32.store8 (i32.add (tee_local $6 - (if + (if i32 (i32.eq (tee_local $6 (call $_fmt_u @@ -4598,7 +4598,7 @@ ) (set_local $5 (block $do-once$64 i32 - (if + (if i32 (i32.eq (i32.sub (tee_local $6 @@ -4812,7 +4812,7 @@ (get_local $54) (get_local $55) (i32.lt_s - (if + (if i32 (get_local $5) (block i32 (i32.store @@ -4909,7 +4909,7 @@ ) (set_local $9 (block $do-once$70 i32 - (if + (if i32 (i32.lt_u (tee_local $7 (i32.add @@ -5109,7 +5109,7 @@ (get_local $8) (tee_local $5 (block $do-once$78 i32 - (if + (if i32 (i32.lt_u (get_local $5) (get_local $6) @@ -5322,7 +5322,7 @@ ) ) (set_local $12 - (if + (if i32 (i32.lt_s (tee_local $7 (i32.add @@ -5492,7 +5492,7 @@ ) ) (set_local $14 - (if + (if f64 (i32.lt_u (get_local $31) (tee_local $25 @@ -5521,7 +5521,7 @@ ) (set_local $22 (block $do-once$90 f64 - (if + (if f64 (get_local $30) (block f64 (drop @@ -5586,7 +5586,7 @@ (i32.const 0) ) (set_local $5 - (if + (if i32 (i32.lt_u (tee_local $7 (i32.add @@ -5759,11 +5759,11 @@ ) (set_local $19 (block $do-once$98 i32 - (if + (if i32 (get_local $21) (block i32 (set_local $16 - (if + (if i32 (i32.and (i32.gt_s (tee_local $5 @@ -5920,7 +5920,7 @@ (i32.const -9) ) ) - (if + (if i32 (i32.eq (i32.or (get_local $6) @@ -6017,7 +6017,7 @@ ) ) (set_local $25 - (if + (if i32 (tee_local $21 (i32.eq (i32.or @@ -6461,7 +6461,7 @@ ) (loop $while-in$121 (set_local $8 - (if + (if i32 (i32.eq (tee_local $5 (call $_fmt_u @@ -6740,7 +6740,7 @@ (if (i32.eqz (i32.and - (if + (if i32 (i32.and (tee_local $5 (i32.load @@ -7239,7 +7239,7 @@ ) ) (set_local $6 - (if + (if i32 (i32.or (i32.ne (get_local $7) @@ -7935,7 +7935,7 @@ (local $3 i32) (local $4 i32) (set_local $1 - (if + (if i32 (i32.or (i32.gt_u (get_local $1) @@ -8171,7 +8171,7 @@ (i32.eqz (i32.and (tee_local $1 - (if + (if i32 (get_local $3) (block i32 (drop @@ -9560,14 +9560,14 @@ (i32.load offset=480 (i32.shl (tee_local $15 - (if + (if i32 (tee_local $2 (i32.shr_u (get_local $2) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $9) (i32.const 16777215) @@ -9828,7 +9828,7 @@ ) (if (tee_local $5 - (if + (if i32 (i32.and (i32.eqz (get_local $8) @@ -10582,14 +10582,14 @@ (i32.const 480) (i32.shl (tee_local $2 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $7) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $7) (i32.const 16777215) @@ -11352,7 +11352,7 @@ ) ) (tee_local $1 - (if + (if i32 (i32.and (tee_local $3 (i32.add @@ -11746,7 +11746,7 @@ ) ) (set_local $10 - (if + (if i32 (i32.lt_u (get_local $2) (tee_local $3 @@ -11975,7 +11975,7 @@ (i32.store (tee_local $0 (i32.add - (if + (if i32 (i32.eq (i32.and (tee_local $1 @@ -12612,7 +12612,7 @@ (i32.shl (tee_local $3 (block $do-once$69 i32 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $2) @@ -13310,14 +13310,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $1 (i32.shr_u (get_local $5) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $5) (i32.const 16777215) @@ -15286,14 +15286,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $1) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $1) (i32.const 16777215) diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index a43f347b1..03b54a532 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -304,7 +304,7 @@ ) (i32.store (get_local $1) - (if + (if i32 (f64.ne (get_local $0) (f64.const 0) @@ -482,7 +482,7 @@ (get_local $5) ) (func $___errno_location (result i32) - (if + (if i32 (i32.load (i32.const 16) ) @@ -662,7 +662,7 @@ (get_local $2) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $___syscall_ret (call $___syscall140 @@ -693,7 +693,7 @@ (local $1 i32) (local $2 i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -721,7 +721,7 @@ (get_local $0) ) ) - (if + (if i32 (get_local $2) (get_local $1) (block i32 @@ -734,7 +734,7 @@ ) (block i32 (set_local $0 - (if + (if i32 (i32.load (i32.const 12) ) @@ -757,7 +757,7 @@ ) (loop $while-in$3 (set_local $2 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $1) @@ -771,7 +771,7 @@ ) ) (set_local $0 - (if + (if i32 (i32.gt_u (i32.load offset=20 (get_local $1) @@ -970,7 +970,7 @@ (i32.eq (get_local $11) (tee_local $5 - (if + (if i32 (i32.load (i32.const 16) ) @@ -1046,7 +1046,7 @@ ) ) (set_local $1 - (if + (if i32 (i32.gt_u (get_local $5) (tee_local $12 @@ -1090,7 +1090,7 @@ (get_local $1) ) ) - (if + (if i32 (i32.eq (get_local $4) (i32.const 2) @@ -1294,7 +1294,7 @@ ) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $_printf_core (i32.const 0) @@ -1308,7 +1308,7 @@ (i32.const -1) (block i32 (set_local $12 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $0) @@ -1349,7 +1349,7 @@ (set_local $2 (select (i32.const -1) - (if + (if i32 (i32.load (tee_local $10 (i32.add @@ -1423,7 +1423,7 @@ (get_local $9) ) ) - (if + (if i32 (get_local $2) (block i32 (drop @@ -1589,7 +1589,7 @@ (drop (call $_memcpy (block $label$break$L10 i32 - (if + (if i32 (i32.gt_s (i32.load8_s offset=75 (get_local $2) @@ -1731,7 +1731,7 @@ (i32.const 255) ) ) - (if + (if i32 (i32.and (tee_local $1 (i32.load @@ -1786,7 +1786,7 @@ ) (func $_wcrtomb (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -1906,7 +1906,7 @@ ) ) ) - (if + (if i32 (i32.lt_u (i32.add (get_local $1) @@ -1989,7 +1989,7 @@ ) ) (func $_wctomb (param $0 i32) (param $1 i32) (result i32) - (if + (if i32 (get_local $0) (call $_wcrtomb (get_local $0) @@ -2247,7 +2247,7 @@ ) ) (func $___syscall_ret (param $0 i32) (result i32) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const -4096) @@ -2599,12 +2599,12 @@ (loop $label$continue$L1 (block $label$break$L1 (set_local $15 - (if + (if i32 (i32.gt_s (get_local $15) (i32.const -1) ) - (if + (if i32 (i32.gt_s (get_local $5) (i32.sub @@ -2800,7 +2800,7 @@ ) ) (set_local $21 - (if + (if i32 (i32.lt_u (tee_local $9 (i32.add @@ -3117,7 +3117,7 @@ ) ) (set_local $8 - (if + (if i32 (i32.lt_s (get_local $7) (i32.const 0) @@ -3244,7 +3244,7 @@ ) (set_local $9 (block $label$break$L46 i32 - (if + (if i32 (i32.eq (i32.load8_s (get_local $10) @@ -3416,7 +3416,7 @@ (br $label$break$L1) ) ) - (if + (if i32 (get_local $33) (block i32 (set_local $7 @@ -4257,7 +4257,7 @@ (get_local $14) ) (set_local $36 - (if + (if i32 (i32.lt_s (i32.load offset=4 (get_global $tempDoublePtr) @@ -4275,7 +4275,7 @@ ) (i32.const 4108) ) - (if + (if i32 (i32.and (get_local $10) (i32.const 2048) @@ -4313,7 +4313,7 @@ ) (set_local $5 (block $do-once$56 i32 - (if + (if i32 (i32.or (i32.lt_u (tee_local $5 @@ -4393,7 +4393,7 @@ ) ) (set_local $14 - (if + (if f64 (i32.or (i32.gt_u (get_local $7) @@ -4461,7 +4461,7 @@ (i32.store8 (i32.add (tee_local $6 - (if + (if i32 (i32.eq (tee_local $6 (call $_fmt_u @@ -4591,7 +4591,7 @@ ) (set_local $5 (block $do-once$64 i32 - (if + (if i32 (i32.eq (i32.sub (tee_local $6 @@ -4805,7 +4805,7 @@ (get_local $54) (get_local $55) (i32.lt_s - (if + (if i32 (get_local $5) (block i32 (i32.store @@ -4902,7 +4902,7 @@ ) (set_local $9 (block $do-once$70 i32 - (if + (if i32 (i32.lt_u (tee_local $7 (i32.add @@ -5102,7 +5102,7 @@ (get_local $8) (tee_local $5 (block $do-once$78 i32 - (if + (if i32 (i32.lt_u (get_local $5) (get_local $6) @@ -5315,7 +5315,7 @@ ) ) (set_local $12 - (if + (if i32 (i32.lt_s (tee_local $7 (i32.add @@ -5485,7 +5485,7 @@ ) ) (set_local $14 - (if + (if f64 (i32.lt_u (get_local $31) (tee_local $25 @@ -5514,7 +5514,7 @@ ) (set_local $22 (block $do-once$90 f64 - (if + (if f64 (get_local $30) (block f64 (drop @@ -5579,7 +5579,7 @@ (i32.const 0) ) (set_local $5 - (if + (if i32 (i32.lt_u (tee_local $7 (i32.add @@ -5752,11 +5752,11 @@ ) (set_local $19 (block $do-once$98 i32 - (if + (if i32 (get_local $21) (block i32 (set_local $16 - (if + (if i32 (i32.and (i32.gt_s (tee_local $5 @@ -5913,7 +5913,7 @@ (i32.const -9) ) ) - (if + (if i32 (i32.eq (i32.or (get_local $6) @@ -6010,7 +6010,7 @@ ) ) (set_local $25 - (if + (if i32 (tee_local $21 (i32.eq (i32.or @@ -6454,7 +6454,7 @@ ) (loop $while-in$121 (set_local $8 - (if + (if i32 (i32.eq (tee_local $5 (call $_fmt_u @@ -6733,7 +6733,7 @@ (if (i32.eqz (i32.and - (if + (if i32 (i32.and (tee_local $5 (i32.load @@ -7232,7 +7232,7 @@ ) ) (set_local $6 - (if + (if i32 (i32.or (i32.ne (get_local $7) @@ -7928,7 +7928,7 @@ (local $3 i32) (local $4 i32) (set_local $1 - (if + (if i32 (i32.or (i32.gt_u (get_local $1) @@ -8164,7 +8164,7 @@ (i32.eqz (i32.and (tee_local $1 - (if + (if i32 (get_local $3) (block i32 (drop @@ -9553,14 +9553,14 @@ (i32.load offset=480 (i32.shl (tee_local $15 - (if + (if i32 (tee_local $2 (i32.shr_u (get_local $2) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $9) (i32.const 16777215) @@ -9821,7 +9821,7 @@ ) (if (tee_local $5 - (if + (if i32 (i32.and (i32.eqz (get_local $8) @@ -10575,14 +10575,14 @@ (i32.const 480) (i32.shl (tee_local $2 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $7) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $7) (i32.const 16777215) @@ -11345,7 +11345,7 @@ ) ) (tee_local $1 - (if + (if i32 (i32.and (tee_local $3 (i32.add @@ -11739,7 +11739,7 @@ ) ) (set_local $10 - (if + (if i32 (i32.lt_u (get_local $2) (tee_local $3 @@ -11968,7 +11968,7 @@ (i32.store (tee_local $0 (i32.add - (if + (if i32 (i32.eq (i32.and (tee_local $1 @@ -12605,7 +12605,7 @@ (i32.shl (tee_local $3 (block $do-once$69 i32 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $2) @@ -13303,14 +13303,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $1 (i32.shr_u (get_local $5) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $5) (i32.const 16777215) @@ -15279,14 +15279,14 @@ (i32.const 480) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $1) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $1) (i32.const 16777215) diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts index fa62da5fd..1714e34a3 100644 --- a/test/emcc_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_hello_world.fromasm.imprecise.no-opts @@ -2576,7 +2576,7 @@ ) ) (set_local $$$call21 - (if + (if i32 (get_local $$tobool26) (i32.const -1) (get_local $$call21) @@ -2641,7 +2641,7 @@ ) ) (set_local $$ret$1$ - (if + (if i32 (get_local $$tobool37) (get_local $$ret$1) (i32.const -1) @@ -4327,7 +4327,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$tobool36) (get_local $$s$2) (i32.const 0) @@ -6265,21 +6265,21 @@ ) ) (set_local $$add$ptr43$arrayidx31 - (if + (if i32 (get_local $$cmp37) (get_local $$add$ptr43) (get_local $$arrayidx31) ) ) (set_local $$$l10n$0 - (if + (if i32 (get_local $$cmp37) (i32.const 1) (get_local $$l10n$0) ) ) (set_local $$isdigittmp$ - (if + (if i32 (get_local $$cmp37) (get_local $$isdigittmp) (i32.const -1) @@ -7783,7 +7783,7 @@ ) ) (set_local $$t$0 - (if + (if i32 (get_local $$or$cond192) (get_local $$and214) (get_local $$conv207) @@ -7808,7 +7808,7 @@ ) ) (set_local $$fl$1$and219 - (if + (if i32 (get_local $$tobool217) (get_local $$fl$1) (get_local $$and219) @@ -8154,7 +8154,7 @@ ) ) (set_local $$cond245 - (if + (if i32 (get_local $$cmp240) (get_local $$p$0) (i32.const 8) @@ -8398,7 +8398,7 @@ ) ) (set_local $$add269$p$0 - (if + (if i32 (get_local $$cmp270) (get_local $$add269) (get_local $$p$0) @@ -8544,7 +8544,7 @@ ) ) (set_local $$$ - (if + (if i32 (get_local $$tobool295) (i32.const 4091) (i32.const 4093) @@ -8724,7 +8724,7 @@ ) ) (set_local $$cond354 - (if + (if i32 (get_local $$tobool349) (get_local $$169) (i32.const 4101) @@ -8916,7 +8916,7 @@ ) ) (set_local $$$$i - (if + (if i32 (get_local $$tobool13$i) (i32.const 4109) (i32.const 4114) @@ -9075,7 +9075,7 @@ ) ) (set_local $$prefix$0$add$ptr65$i - (if + (if i32 (get_local $$tobool63$i) (get_local $$prefix$0$i) (get_local $$add$ptr65$i) @@ -9251,7 +9251,7 @@ ) ) (set_local $$cond100$i - (if + (if i32 (get_local $$cmp94$i) (get_local $$sub97$i) (get_local $$198) @@ -9592,7 +9592,7 @@ ) ) (set_local $$l$0$i - (if + (if i32 (get_local $$or$cond384) (get_local $$add154$i) (get_local $$add163$i) @@ -9759,7 +9759,7 @@ ) ) (set_local $$w$add165$i - (if + (if i32 (get_local $$cmp188$i) (get_local $$w$1) (get_local $$add165$i) @@ -9778,7 +9778,7 @@ ) ) (set_local $$$p$i - (if + (if i32 (get_local $$cmp196$i) (i32.const 6) (get_local $$p$0) @@ -9836,7 +9836,7 @@ ) ) (set_local $$arraydecay208$add$ptr213$i - (if + (if i32 (get_local $$cmp205$i) (get_local $$big$i) (get_local $$add$ptr213$i) @@ -9943,7 +9943,7 @@ ) ) (set_local $$cond233$i - (if + (if i32 (get_local $$cmp228$i) (i32.const 29) (get_local $$211) @@ -10268,7 +10268,7 @@ ) ) (set_local $$cond271$i - (if + (if i32 (get_local $$cmp265$i) (i32.const 9) (get_local $$sub264$i) @@ -10393,7 +10393,7 @@ ) ) (set_local $$incdec$ptr292$a$3$i - (if + (if i32 (get_local $$tobool290$i) (get_local $$incdec$ptr292$i) (get_local $$a$3539$i) @@ -10453,7 +10453,7 @@ ) ) (set_local $$incdec$ptr292$a$3$571$i - (if + (if i32 (get_local $$tobool290$569$i) (get_local $$incdec$ptr292$570$i) (get_local $$a$3539$i) @@ -10469,7 +10469,7 @@ ) ) (set_local $$cond304$i - (if + (if i32 (get_local $$cmp299$i) (get_local $$arraydecay208$add$ptr213$i) (get_local $$incdec$ptr292$a$3573$i) @@ -10509,7 +10509,7 @@ ) ) (set_local $$add$ptr311$z$4$i - (if + (if i32 (get_local $$cmp308$i) (get_local $$add$ptr311$i) (get_local $$z$4$i) @@ -10684,7 +10684,7 @@ ) ) (set_local $$mul335$i - (if + (if i32 (get_local $$cmp333$i) (get_local $$e$1$i) (i32.const 0) @@ -10951,7 +10951,7 @@ ) ) (set_local $$$396$i - (if + (if f64 (get_local $$tobool380$i) (f64.const 9007199254740992) (f64.const 9007199254740994) @@ -10991,7 +10991,7 @@ ) ) (set_local $$$404$i - (if + (if f64 (get_local $$or$cond397$i) (f64.const 1) (f64.const 1.5) @@ -11344,7 +11344,7 @@ ) ) (set_local $$add$ptr442$z$3$i - (if + (if i32 (get_local $$cmp443$i) (get_local $$add$ptr442$i) (get_local $$z$3$lcssa$i) @@ -11728,7 +11728,7 @@ ) ) (set_local $$$sub514$i - (if + (if i32 (get_local $$cmp515$i) (i32.const 0) (get_local $$sub514$i) @@ -11741,7 +11741,7 @@ ) ) (set_local $$p$addr$2$$sub514398$i - (if + (if i32 (get_local $$cmp528$i) (get_local $$p$addr$2$i) (get_local $$$sub514$i) @@ -11778,7 +11778,7 @@ ) ) (set_local $$$sub562$i - (if + (if i32 (get_local $$cmp563$i) (i32.const 0) (get_local $$sub562$i) @@ -11791,7 +11791,7 @@ ) ) (set_local $$p$addr$2$$sub562399$i - (if + (if i32 (get_local $$cmp577$i) (get_local $$p$addr$2$i) (get_local $$$sub562$i) @@ -11869,7 +11869,7 @@ ) ) (set_local $$add620$i - (if + (if i32 (get_local $$cmp617$i) (get_local $$e$5$ph$i) (i32.const 0) @@ -11890,7 +11890,7 @@ ) ) (set_local $$cond629$i - (if + (if i32 (get_local $$cmp623$i) (get_local $$sub626$le$i) (get_local $$e$5$ph$i) @@ -12135,7 +12135,7 @@ ) ) (set_local $$r$0$a$9$i - (if + (if i32 (get_local $$cmp660$i) (get_local $$arraydecay208$add$ptr213$i) (get_local $$a$9$ph$i) @@ -12476,7 +12476,7 @@ ) ) (set_local $$cond732$i - (if + (if i32 (get_local $$cmp727$i) (i32.const 9) (get_local $$p$addr$4489$i) @@ -12568,7 +12568,7 @@ ) ) (set_local $$z$7$add$ptr742$i - (if + (if i32 (get_local $$cmp450$lcssa$i) (get_local $$z$7$i$lcssa) (get_local $$add$ptr742$i) @@ -12824,7 +12824,7 @@ ) ) (set_local $$cond800$i - (if + (if i32 (get_local $$cmp790$i) (get_local $$sub$ptr$sub789$i) (get_local $$p$addr$5501$i) @@ -12969,7 +12969,7 @@ ) ) (set_local $$w$add653$i - (if + (if i32 (get_local $$cmp818$i) (get_local $$w$1) (get_local $$add653$i) @@ -12993,7 +12993,7 @@ ) ) (set_local $$cond$i - (if + (if i32 (get_local $$tobool37$i) (i32.const 4127) (i32.const 4131) @@ -13012,21 +13012,21 @@ ) ) (set_local $$cond43$i - (if + (if i32 (get_local $$tobool37$i) (i32.const 4135) (i32.const 4139) ) ) (set_local $$pl$1$i - (if + (if i32 (get_local $$cmp38$i) (i32.const 0) (get_local $$pl$0$i) ) ) (set_local $$s35$0$i - (if + (if i32 (get_local $$cmp38$i) (get_local $$cond43$i) (get_local $$cond$i) @@ -13127,7 +13127,7 @@ ) ) (set_local $$cond53$i - (if + (if i32 (get_local $$cmp48$i) (get_local $$w$1) (get_local $$add$i$239) @@ -13562,14 +13562,14 @@ ) ) (set_local $$z$1 - (if + (if i32 (get_local $$tobool357) (get_local $$add$ptr359) (get_local $$call356) ) ) (set_local $$p$3 - (if + (if i32 (get_local $$tobool357) (get_local $$p$0) (get_local $$sub$ptr$sub363) @@ -13932,7 +13932,7 @@ ) ) (set_local $$cond426 - (if + (if i32 (get_local $$cmp421) (get_local $$w$1) (get_local $$i$0$lcssa368) @@ -13975,7 +13975,7 @@ ) ) (set_local $$and309$fl$4 - (if + (if i32 (get_local $$cmp306) (get_local $$and309) (get_local $$fl$4) @@ -14073,7 +14073,7 @@ ) ) (set_local $$p$2$add322 - (if + (if i32 (get_local $$cmp323) (get_local $$p$2) (get_local $$add322) @@ -14140,7 +14140,7 @@ ) ) (set_local $$sub$ptr$sub433$p$5 - (if + (if i32 (get_local $$cmp434) (get_local $$sub$ptr$sub433) (get_local $$p$5) @@ -14159,7 +14159,7 @@ ) ) (set_local $$w$2 - (if + (if i32 (get_local $$cmp442) (get_local $$add441) (get_local $$w$1) @@ -16156,7 +16156,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$cmp1) (i32.const 256) (get_local $$sub) @@ -17536,7 +17536,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$cmp1) (i32.const 16) (get_local $$and) @@ -18622,14 +18622,14 @@ ) ) (set_local $$sub31$rsize$0$i - (if + (if i32 (get_local $$cmp32$i) (get_local $$sub31$i) (get_local $$rsize$0$i) ) ) (set_local $$cond$v$0$i - (if + (if i32 (get_local $$cmp32$i) (get_local $$cond4$i) (get_local $$v$0$i) @@ -19826,7 +19826,7 @@ ) ) (set_local $$cond$i - (if + (if i32 (get_local $$cmp26$i) (i32.const 0) (get_local $$sub30$i) @@ -19982,7 +19982,7 @@ ) ) (set_local $$rst$1$i - (if + (if i32 (get_local $$or$cond1$i) (get_local $$rst$0$i) (get_local $$54) @@ -20352,14 +20352,14 @@ ) ) (set_local $$sub101$rsize$4$i - (if + (if i32 (get_local $$cmp102$i) (get_local $$sub101$i) (get_local $$rsize$49$i) ) ) (set_local $$t$4$v$4$i - (if + (if i32 (get_local $$cmp102$i) (get_local $$t$48$i) (get_local $$v$410$i) @@ -21651,7 +21651,7 @@ ) ) (set_local $$cond383$i - (if + (if i32 (get_local $$cmp374$i) (i32.const 0) (get_local $$sub381$i) @@ -23325,7 +23325,7 @@ ) ) (set_local $$cond$i$i - (if + (if i32 (get_local $$cmp$i$13$i) (i32.const 0) (get_local $$and3$i$i) @@ -23577,7 +23577,7 @@ ) ) (set_local $$cond$i$25$i - (if + (if i32 (get_local $$cmp$i$23$i) (i32.const 0) (get_local $$and3$i$24$i) @@ -23843,7 +23843,7 @@ ) ) (set_local $$cond$i$36$i - (if + (if i32 (get_local $$cmp$i$34$i) (i32.const 0) (get_local $$and3$i$35$i) @@ -23889,7 +23889,7 @@ ) ) (set_local $$cond15$i$i - (if + (if i32 (get_local $$cmp7$i$i) (i32.const 0) (get_local $$and13$i$i) @@ -25413,7 +25413,7 @@ ) ) (set_local $$cond315$i$i - (if + (if i32 (get_local $$cmp306$i$i) (i32.const 0) (get_local $$sub313$i$i) @@ -25813,7 +25813,7 @@ ) ) (set_local $$cond$i$16$i - (if + (if i32 (get_local $$cmp$i$15$i) (i32.const 0) (get_local $$and6$i$i) @@ -25838,7 +25838,7 @@ ) ) (set_local $$cond13$i$i - (if + (if i32 (get_local $$cmp9$i$i) (get_local $$119) (get_local $$add$ptr7$i$i) @@ -25896,7 +25896,7 @@ ) ) (set_local $$cond$i$i$i - (if + (if i32 (get_local $$cmp$i$2$i$i) (i32.const 0) (get_local $$and3$i$i$i) @@ -26578,7 +26578,7 @@ ) ) (set_local $$cond115$i$i - (if + (if i32 (get_local $$cmp106$i$i) (i32.const 0) (get_local $$sub113$i$i) @@ -29935,7 +29935,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$cmp584) (i32.const 0) (get_local $$sub589) @@ -30836,7 +30836,7 @@ ) ) (set_global $tempRet0 - (if + (if i32 (i32.lt_s (get_local $high) (i32.const 0) @@ -30980,7 +30980,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -30995,7 +30995,7 @@ (set_local $$1$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31006,7 +31006,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31025,7 +31025,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31040,7 +31040,7 @@ (set_local $$2$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31051,7 +31051,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31164,7 +31164,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31179,7 +31179,7 @@ (set_local $$1$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31190,7 +31190,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31209,7 +31209,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31224,7 +31224,7 @@ (set_local $$2$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31235,7 +31235,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts index 6942c296b..203f31224 100644 --- a/test/emcc_hello_world.fromasm.no-opts +++ b/test/emcc_hello_world.fromasm.no-opts @@ -2582,7 +2582,7 @@ ) ) (set_local $$$call21 - (if + (if i32 (get_local $$tobool26) (i32.const -1) (get_local $$call21) @@ -2647,7 +2647,7 @@ ) ) (set_local $$ret$1$ - (if + (if i32 (get_local $$tobool37) (get_local $$ret$1) (i32.const -1) @@ -4333,7 +4333,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$tobool36) (get_local $$s$2) (i32.const 0) @@ -6271,21 +6271,21 @@ ) ) (set_local $$add$ptr43$arrayidx31 - (if + (if i32 (get_local $$cmp37) (get_local $$add$ptr43) (get_local $$arrayidx31) ) ) (set_local $$$l10n$0 - (if + (if i32 (get_local $$cmp37) (i32.const 1) (get_local $$l10n$0) ) ) (set_local $$isdigittmp$ - (if + (if i32 (get_local $$cmp37) (get_local $$isdigittmp) (i32.const -1) @@ -7789,7 +7789,7 @@ ) ) (set_local $$t$0 - (if + (if i32 (get_local $$or$cond192) (get_local $$and214) (get_local $$conv207) @@ -7814,7 +7814,7 @@ ) ) (set_local $$fl$1$and219 - (if + (if i32 (get_local $$tobool217) (get_local $$fl$1) (get_local $$and219) @@ -8160,7 +8160,7 @@ ) ) (set_local $$cond245 - (if + (if i32 (get_local $$cmp240) (get_local $$p$0) (i32.const 8) @@ -8404,7 +8404,7 @@ ) ) (set_local $$add269$p$0 - (if + (if i32 (get_local $$cmp270) (get_local $$add269) (get_local $$p$0) @@ -8550,7 +8550,7 @@ ) ) (set_local $$$ - (if + (if i32 (get_local $$tobool295) (i32.const 4091) (i32.const 4093) @@ -8730,7 +8730,7 @@ ) ) (set_local $$cond354 - (if + (if i32 (get_local $$tobool349) (get_local $$169) (i32.const 4101) @@ -8922,7 +8922,7 @@ ) ) (set_local $$$$i - (if + (if i32 (get_local $$tobool13$i) (i32.const 4109) (i32.const 4114) @@ -9081,7 +9081,7 @@ ) ) (set_local $$prefix$0$add$ptr65$i - (if + (if i32 (get_local $$tobool63$i) (get_local $$prefix$0$i) (get_local $$add$ptr65$i) @@ -9257,7 +9257,7 @@ ) ) (set_local $$cond100$i - (if + (if i32 (get_local $$cmp94$i) (get_local $$sub97$i) (get_local $$198) @@ -9598,7 +9598,7 @@ ) ) (set_local $$l$0$i - (if + (if i32 (get_local $$or$cond384) (get_local $$add154$i) (get_local $$add163$i) @@ -9765,7 +9765,7 @@ ) ) (set_local $$w$add165$i - (if + (if i32 (get_local $$cmp188$i) (get_local $$w$1) (get_local $$add165$i) @@ -9784,7 +9784,7 @@ ) ) (set_local $$$p$i - (if + (if i32 (get_local $$cmp196$i) (i32.const 6) (get_local $$p$0) @@ -9842,7 +9842,7 @@ ) ) (set_local $$arraydecay208$add$ptr213$i - (if + (if i32 (get_local $$cmp205$i) (get_local $$big$i) (get_local $$add$ptr213$i) @@ -9949,7 +9949,7 @@ ) ) (set_local $$cond233$i - (if + (if i32 (get_local $$cmp228$i) (i32.const 29) (get_local $$211) @@ -10274,7 +10274,7 @@ ) ) (set_local $$cond271$i - (if + (if i32 (get_local $$cmp265$i) (i32.const 9) (get_local $$sub264$i) @@ -10399,7 +10399,7 @@ ) ) (set_local $$incdec$ptr292$a$3$i - (if + (if i32 (get_local $$tobool290$i) (get_local $$incdec$ptr292$i) (get_local $$a$3539$i) @@ -10459,7 +10459,7 @@ ) ) (set_local $$incdec$ptr292$a$3$571$i - (if + (if i32 (get_local $$tobool290$569$i) (get_local $$incdec$ptr292$570$i) (get_local $$a$3539$i) @@ -10475,7 +10475,7 @@ ) ) (set_local $$cond304$i - (if + (if i32 (get_local $$cmp299$i) (get_local $$arraydecay208$add$ptr213$i) (get_local $$incdec$ptr292$a$3573$i) @@ -10515,7 +10515,7 @@ ) ) (set_local $$add$ptr311$z$4$i - (if + (if i32 (get_local $$cmp308$i) (get_local $$add$ptr311$i) (get_local $$z$4$i) @@ -10690,7 +10690,7 @@ ) ) (set_local $$mul335$i - (if + (if i32 (get_local $$cmp333$i) (get_local $$e$1$i) (i32.const 0) @@ -10957,7 +10957,7 @@ ) ) (set_local $$$396$i - (if + (if f64 (get_local $$tobool380$i) (f64.const 9007199254740992) (f64.const 9007199254740994) @@ -10997,7 +10997,7 @@ ) ) (set_local $$$404$i - (if + (if f64 (get_local $$or$cond397$i) (f64.const 1) (f64.const 1.5) @@ -11350,7 +11350,7 @@ ) ) (set_local $$add$ptr442$z$3$i - (if + (if i32 (get_local $$cmp443$i) (get_local $$add$ptr442$i) (get_local $$z$3$lcssa$i) @@ -11734,7 +11734,7 @@ ) ) (set_local $$$sub514$i - (if + (if i32 (get_local $$cmp515$i) (i32.const 0) (get_local $$sub514$i) @@ -11747,7 +11747,7 @@ ) ) (set_local $$p$addr$2$$sub514398$i - (if + (if i32 (get_local $$cmp528$i) (get_local $$p$addr$2$i) (get_local $$$sub514$i) @@ -11784,7 +11784,7 @@ ) ) (set_local $$$sub562$i - (if + (if i32 (get_local $$cmp563$i) (i32.const 0) (get_local $$sub562$i) @@ -11797,7 +11797,7 @@ ) ) (set_local $$p$addr$2$$sub562399$i - (if + (if i32 (get_local $$cmp577$i) (get_local $$p$addr$2$i) (get_local $$$sub562$i) @@ -11875,7 +11875,7 @@ ) ) (set_local $$add620$i - (if + (if i32 (get_local $$cmp617$i) (get_local $$e$5$ph$i) (i32.const 0) @@ -11896,7 +11896,7 @@ ) ) (set_local $$cond629$i - (if + (if i32 (get_local $$cmp623$i) (get_local $$sub626$le$i) (get_local $$e$5$ph$i) @@ -12141,7 +12141,7 @@ ) ) (set_local $$r$0$a$9$i - (if + (if i32 (get_local $$cmp660$i) (get_local $$arraydecay208$add$ptr213$i) (get_local $$a$9$ph$i) @@ -12482,7 +12482,7 @@ ) ) (set_local $$cond732$i - (if + (if i32 (get_local $$cmp727$i) (i32.const 9) (get_local $$p$addr$4489$i) @@ -12574,7 +12574,7 @@ ) ) (set_local $$z$7$add$ptr742$i - (if + (if i32 (get_local $$cmp450$lcssa$i) (get_local $$z$7$i$lcssa) (get_local $$add$ptr742$i) @@ -12830,7 +12830,7 @@ ) ) (set_local $$cond800$i - (if + (if i32 (get_local $$cmp790$i) (get_local $$sub$ptr$sub789$i) (get_local $$p$addr$5501$i) @@ -12975,7 +12975,7 @@ ) ) (set_local $$w$add653$i - (if + (if i32 (get_local $$cmp818$i) (get_local $$w$1) (get_local $$add653$i) @@ -12999,7 +12999,7 @@ ) ) (set_local $$cond$i - (if + (if i32 (get_local $$tobool37$i) (i32.const 4127) (i32.const 4131) @@ -13018,21 +13018,21 @@ ) ) (set_local $$cond43$i - (if + (if i32 (get_local $$tobool37$i) (i32.const 4135) (i32.const 4139) ) ) (set_local $$pl$1$i - (if + (if i32 (get_local $$cmp38$i) (i32.const 0) (get_local $$pl$0$i) ) ) (set_local $$s35$0$i - (if + (if i32 (get_local $$cmp38$i) (get_local $$cond43$i) (get_local $$cond$i) @@ -13133,7 +13133,7 @@ ) ) (set_local $$cond53$i - (if + (if i32 (get_local $$cmp48$i) (get_local $$w$1) (get_local $$add$i$239) @@ -13568,14 +13568,14 @@ ) ) (set_local $$z$1 - (if + (if i32 (get_local $$tobool357) (get_local $$add$ptr359) (get_local $$call356) ) ) (set_local $$p$3 - (if + (if i32 (get_local $$tobool357) (get_local $$p$0) (get_local $$sub$ptr$sub363) @@ -13938,7 +13938,7 @@ ) ) (set_local $$cond426 - (if + (if i32 (get_local $$cmp421) (get_local $$w$1) (get_local $$i$0$lcssa368) @@ -13981,7 +13981,7 @@ ) ) (set_local $$and309$fl$4 - (if + (if i32 (get_local $$cmp306) (get_local $$and309) (get_local $$fl$4) @@ -14079,7 +14079,7 @@ ) ) (set_local $$p$2$add322 - (if + (if i32 (get_local $$cmp323) (get_local $$p$2) (get_local $$add322) @@ -14146,7 +14146,7 @@ ) ) (set_local $$sub$ptr$sub433$p$5 - (if + (if i32 (get_local $$cmp434) (get_local $$sub$ptr$sub433) (get_local $$p$5) @@ -14165,7 +14165,7 @@ ) ) (set_local $$w$2 - (if + (if i32 (get_local $$cmp442) (get_local $$add441) (get_local $$w$1) @@ -16162,7 +16162,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$cmp1) (i32.const 256) (get_local $$sub) @@ -17542,7 +17542,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$cmp1) (i32.const 16) (get_local $$and) @@ -18628,14 +18628,14 @@ ) ) (set_local $$sub31$rsize$0$i - (if + (if i32 (get_local $$cmp32$i) (get_local $$sub31$i) (get_local $$rsize$0$i) ) ) (set_local $$cond$v$0$i - (if + (if i32 (get_local $$cmp32$i) (get_local $$cond4$i) (get_local $$v$0$i) @@ -19832,7 +19832,7 @@ ) ) (set_local $$cond$i - (if + (if i32 (get_local $$cmp26$i) (i32.const 0) (get_local $$sub30$i) @@ -19988,7 +19988,7 @@ ) ) (set_local $$rst$1$i - (if + (if i32 (get_local $$or$cond1$i) (get_local $$rst$0$i) (get_local $$54) @@ -20358,14 +20358,14 @@ ) ) (set_local $$sub101$rsize$4$i - (if + (if i32 (get_local $$cmp102$i) (get_local $$sub101$i) (get_local $$rsize$49$i) ) ) (set_local $$t$4$v$4$i - (if + (if i32 (get_local $$cmp102$i) (get_local $$t$48$i) (get_local $$v$410$i) @@ -21657,7 +21657,7 @@ ) ) (set_local $$cond383$i - (if + (if i32 (get_local $$cmp374$i) (i32.const 0) (get_local $$sub381$i) @@ -23331,7 +23331,7 @@ ) ) (set_local $$cond$i$i - (if + (if i32 (get_local $$cmp$i$13$i) (i32.const 0) (get_local $$and3$i$i) @@ -23583,7 +23583,7 @@ ) ) (set_local $$cond$i$25$i - (if + (if i32 (get_local $$cmp$i$23$i) (i32.const 0) (get_local $$and3$i$24$i) @@ -23849,7 +23849,7 @@ ) ) (set_local $$cond$i$36$i - (if + (if i32 (get_local $$cmp$i$34$i) (i32.const 0) (get_local $$and3$i$35$i) @@ -23895,7 +23895,7 @@ ) ) (set_local $$cond15$i$i - (if + (if i32 (get_local $$cmp7$i$i) (i32.const 0) (get_local $$and13$i$i) @@ -25419,7 +25419,7 @@ ) ) (set_local $$cond315$i$i - (if + (if i32 (get_local $$cmp306$i$i) (i32.const 0) (get_local $$sub313$i$i) @@ -25819,7 +25819,7 @@ ) ) (set_local $$cond$i$16$i - (if + (if i32 (get_local $$cmp$i$15$i) (i32.const 0) (get_local $$and6$i$i) @@ -25844,7 +25844,7 @@ ) ) (set_local $$cond13$i$i - (if + (if i32 (get_local $$cmp9$i$i) (get_local $$119) (get_local $$add$ptr7$i$i) @@ -25902,7 +25902,7 @@ ) ) (set_local $$cond$i$i$i - (if + (if i32 (get_local $$cmp$i$2$i$i) (i32.const 0) (get_local $$and3$i$i$i) @@ -26584,7 +26584,7 @@ ) ) (set_local $$cond115$i$i - (if + (if i32 (get_local $$cmp106$i$i) (i32.const 0) (get_local $$sub113$i$i) @@ -29941,7 +29941,7 @@ ) ) (set_local $$cond - (if + (if i32 (get_local $$cmp584) (i32.const 0) (get_local $$sub589) @@ -30842,7 +30842,7 @@ ) ) (set_global $tempRet0 - (if + (if i32 (i32.lt_s (get_local $high) (i32.const 0) @@ -30986,7 +30986,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31001,7 +31001,7 @@ (set_local $$1$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31012,7 +31012,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31031,7 +31031,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31046,7 +31046,7 @@ (set_local $$2$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31057,7 +31057,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31170,7 +31170,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31185,7 +31185,7 @@ (set_local $$1$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31196,7 +31196,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -31215,7 +31215,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31230,7 +31230,7 @@ (set_local $$2$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -31241,7 +31241,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm index 7847fa1dc..e8dbd3f28 100644 --- a/test/memorygrowth.fromasm +++ b/test/memorygrowth.fromasm @@ -1471,14 +1471,14 @@ (i32.add (i32.shl (tee_local $27 - (if + (if i32 (tee_local $17 (i32.shr_u (get_local $3) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const 16777215) @@ -1752,7 +1752,7 @@ ) (if (tee_local $2 - (if + (if i32 (i32.and (i32.eqz (get_local $37) @@ -2534,14 +2534,14 @@ (i32.const 1512) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $5 (i32.shr_u (get_local $16) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $16) (i32.const 16777215) @@ -3200,7 +3200,7 @@ (i32.eq (tee_local $9 (block $label$break$b i32 - (if + (if i32 (i32.and (i32.load (i32.const 1652) @@ -3354,7 +3354,7 @@ ) (block (set_local $2 - (if + (if i32 (i32.and (tee_local $19 (i32.add @@ -3843,7 +3843,7 @@ ) ) (set_local $8 - (if + (if i32 (i32.lt_u (get_local $20) (tee_local $13 @@ -4083,7 +4083,7 @@ (i32.store (tee_local $0 (i32.add - (if + (if i32 (i32.eq (i32.and (tee_local $2 @@ -4726,7 +4726,7 @@ (i32.shl (tee_local $6 (block $do-once$67 i32 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $14) @@ -5447,14 +5447,14 @@ (i32.const 1512) (i32.shl (tee_local $2 - (if + (if i32 (tee_local $13 (i32.shr_u (get_local $1) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $1) (i32.const 16777215) @@ -7469,14 +7469,14 @@ (i32.const 1512) (i32.shl (tee_local $7 - (if + (if i32 (tee_local $1 (i32.shr_u (get_local $0) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const 16777215) @@ -7949,7 +7949,7 @@ (i32.eq (get_local $3) (tee_local $6 - (if + (if i32 (i32.load (i32.const 1160) ) @@ -8041,7 +8041,7 @@ ) ) (set_local $5 - (if + (if i32 (i32.gt_u (get_local $6) (tee_local $14 @@ -8085,7 +8085,7 @@ (get_local $5) ) ) - (if + (if i32 (i32.eq (get_local $4) (i32.const 2) @@ -8320,7 +8320,7 @@ ) (set_local $1 (block $label$break$b i32 - (if + (if i32 (i32.gt_s (i32.load8_s offset=75 (get_local $2) @@ -8604,7 +8604,7 @@ (local $1 i32) (local $2 i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -8632,7 +8632,7 @@ (get_local $0) ) ) - (if + (if i32 (get_local $2) (get_local $1) (block i32 @@ -8645,7 +8645,7 @@ ) (block i32 (set_local $0 - (if + (if i32 (i32.load (i32.const 1140) ) @@ -8675,7 +8675,7 @@ ) (loop $while-in$3 (set_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $1) @@ -8689,7 +8689,7 @@ ) ) (set_local $2 - (if + (if i32 (i32.gt_u (i32.load offset=20 (get_local $1) @@ -8851,7 +8851,7 @@ ) ) (set_local $4 - (if + (if i32 (i32.eq (call_indirect $FUNCSIG$iiii (get_local $0) @@ -9313,7 +9313,7 @@ (local $2 i32) (local $3 i32) (set_local $3 - (if + (if i32 (i32.gt_s (i32.load offset=76 (tee_local $1 @@ -9332,7 +9332,7 @@ ) (set_local $0 (block $do-once$0 i32 - (if + (if i32 (i32.lt_s (call $cb (get_local $0) @@ -9431,7 +9431,7 @@ (get_local $2) ) ) - (if + (if i32 (i32.and (tee_local $2 (i32.load @@ -9493,10 +9493,10 @@ (get_local $1) ) ) - (if + (if i32 (i32.eq (tee_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $3) @@ -9518,7 +9518,7 @@ (get_local $3) ) ) - (if + (if i32 (get_local $5) (get_local $0) (block i32 @@ -9587,7 +9587,7 @@ (get_local $2) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $Pa (call $ua @@ -9768,7 +9768,7 @@ (get_local $0) ) (func $Pa (param $0 i32) (result i32) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const -4096) @@ -9813,7 +9813,7 @@ ) ) (func $Qa (result i32) - (if + (if i32 (i32.load (i32.const 1160) ) diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise index febb33861..6d0ada287 100644 --- a/test/memorygrowth.fromasm.imprecise +++ b/test/memorygrowth.fromasm.imprecise @@ -1469,14 +1469,14 @@ (i32.add (i32.shl (tee_local $27 - (if + (if i32 (tee_local $17 (i32.shr_u (get_local $3) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const 16777215) @@ -1750,7 +1750,7 @@ ) (if (tee_local $2 - (if + (if i32 (i32.and (i32.eqz (get_local $37) @@ -2532,14 +2532,14 @@ (i32.const 1512) (i32.shl (tee_local $3 - (if + (if i32 (tee_local $5 (i32.shr_u (get_local $16) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $16) (i32.const 16777215) @@ -3198,7 +3198,7 @@ (i32.eq (tee_local $9 (block $label$break$b i32 - (if + (if i32 (i32.and (i32.load (i32.const 1652) @@ -3352,7 +3352,7 @@ ) (block (set_local $2 - (if + (if i32 (i32.and (tee_local $19 (i32.add @@ -3841,7 +3841,7 @@ ) ) (set_local $8 - (if + (if i32 (i32.lt_u (get_local $20) (tee_local $13 @@ -4081,7 +4081,7 @@ (i32.store (tee_local $0 (i32.add - (if + (if i32 (i32.eq (i32.and (tee_local $2 @@ -4724,7 +4724,7 @@ (i32.shl (tee_local $6 (block $do-once$67 i32 - (if + (if i32 (tee_local $0 (i32.shr_u (get_local $14) @@ -5445,14 +5445,14 @@ (i32.const 1512) (i32.shl (tee_local $2 - (if + (if i32 (tee_local $13 (i32.shr_u (get_local $1) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $1) (i32.const 16777215) @@ -7467,14 +7467,14 @@ (i32.const 1512) (i32.shl (tee_local $7 - (if + (if i32 (tee_local $1 (i32.shr_u (get_local $0) (i32.const 8) ) ) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const 16777215) @@ -7947,7 +7947,7 @@ (i32.eq (get_local $3) (tee_local $6 - (if + (if i32 (i32.load (i32.const 1160) ) @@ -8039,7 +8039,7 @@ ) ) (set_local $5 - (if + (if i32 (i32.gt_u (get_local $6) (tee_local $14 @@ -8083,7 +8083,7 @@ (get_local $5) ) ) - (if + (if i32 (i32.eq (get_local $4) (i32.const 2) @@ -8318,7 +8318,7 @@ ) (set_local $1 (block $label$break$b i32 - (if + (if i32 (i32.gt_s (i32.load8_s offset=75 (get_local $2) @@ -8602,7 +8602,7 @@ (local $1 i32) (local $2 i32) (block $do-once$0 i32 - (if + (if i32 (get_local $0) (block i32 (if @@ -8630,7 +8630,7 @@ (get_local $0) ) ) - (if + (if i32 (get_local $2) (get_local $1) (block i32 @@ -8643,7 +8643,7 @@ ) (block i32 (set_local $0 - (if + (if i32 (i32.load (i32.const 1140) ) @@ -8673,7 +8673,7 @@ ) (loop $while-in$3 (set_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $1) @@ -8687,7 +8687,7 @@ ) ) (set_local $2 - (if + (if i32 (i32.gt_u (i32.load offset=20 (get_local $1) @@ -8849,7 +8849,7 @@ ) ) (set_local $4 - (if + (if i32 (i32.eq (call_indirect $FUNCSIG$iiii (get_local $0) @@ -9311,7 +9311,7 @@ (local $2 i32) (local $3 i32) (set_local $3 - (if + (if i32 (i32.gt_s (i32.load offset=76 (tee_local $1 @@ -9330,7 +9330,7 @@ ) (set_local $0 (block $do-once$0 i32 - (if + (if i32 (i32.lt_s (call $cb (get_local $0) @@ -9429,7 +9429,7 @@ (get_local $2) ) ) - (if + (if i32 (i32.and (tee_local $2 (i32.load @@ -9491,10 +9491,10 @@ (get_local $1) ) ) - (if + (if i32 (i32.eq (tee_local $0 - (if + (if i32 (i32.gt_s (i32.load offset=76 (get_local $3) @@ -9516,7 +9516,7 @@ (get_local $3) ) ) - (if + (if i32 (get_local $5) (get_local $0) (block i32 @@ -9585,7 +9585,7 @@ (get_local $2) ) (set_local $0 - (if + (if i32 (i32.lt_s (call $Pa (call $ua @@ -9766,7 +9766,7 @@ (get_local $0) ) (func $Pa (param $0 i32) (result i32) - (if + (if i32 (i32.gt_u (get_local $0) (i32.const -4096) @@ -9811,7 +9811,7 @@ ) ) (func $Qa (result i32) - (if + (if i32 (i32.load (i32.const 1160) ) diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts index 0de4e25b3..c3a8c7d63 100644 --- a/test/memorygrowth.fromasm.imprecise.no-opts +++ b/test/memorygrowth.fromasm.imprecise.no-opts @@ -192,7 +192,7 @@ ) (block (set_local $d - (if + (if i32 (i32.lt_u (get_local $a) (i32.const 11) @@ -1008,7 +1008,7 @@ ) ) (set_local $e - (if + (if i32 (get_local $f) (get_local $j) (get_local $e) @@ -1018,7 +1018,7 @@ (get_local $B) ) (set_local $s - (if + (if i32 (get_local $f) (get_local $B) (get_local $s) @@ -1885,7 +1885,7 @@ (set_local $s (i32.shl (get_local $e) - (if + (if i32 (i32.eq (get_local $J) (i32.const 31) @@ -1995,7 +1995,7 @@ ) ) (set_local $m - (if + (if i32 (i32.or (i32.eq (get_local $l) @@ -2285,14 +2285,14 @@ ) ) (set_local $g - (if + (if i32 (get_local $s) (get_local $i) (get_local $O) ) ) (set_local $i - (if + (if i32 (get_local $s) (get_local $P) (get_local $Q) @@ -3212,7 +3212,7 @@ (set_local $q (i32.shl (get_local $U) - (if + (if i32 (i32.eq (get_local $ba) (i32.const 31) @@ -4433,7 +4433,7 @@ ) ) (set_local $c - (if + (if i32 (i32.eq (i32.and (get_local $ma) @@ -4609,7 +4609,7 @@ ) ) (set_local $ca - (if + (if i32 (i32.eq (i32.and (get_local $ka) @@ -4805,7 +4805,7 @@ (set_local $ca (i32.add (get_local $ha) - (if + (if i32 (i32.eq (i32.and (get_local $ka) @@ -4833,7 +4833,7 @@ (set_local $ma (i32.add (get_local $c) - (if + (if i32 (i32.eq (i32.and (get_local $ka) @@ -5938,7 +5938,7 @@ (set_local $aa (i32.shl (get_local $Ea) - (if + (if i32 (i32.eq (get_local $Ha) (i32.const 31) @@ -6235,7 +6235,7 @@ (set_local $ka (i32.add (get_local $ca) - (if + (if i32 (i32.eq (i32.and (get_local $ea) @@ -6261,7 +6261,7 @@ ) ) (set_local $ca - (if + (if i32 (i32.lt_u (get_local $ka) (get_local $ea) @@ -6283,7 +6283,7 @@ ) ) (set_local $c - (if + (if i32 (i32.eq (i32.and (get_local $ma) @@ -6788,7 +6788,7 @@ (set_local $ma (i32.shl (get_local $ka) - (if + (if i32 (i32.eq (get_local $Oa) (i32.const 31) @@ -9022,7 +9022,7 @@ (set_local $F (i32.shl (get_local $D) - (if + (if i32 (i32.eq (get_local $G) (i32.const 31) diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts index 124e87a18..3c7d6a1b4 100644 --- a/test/memorygrowth.fromasm.no-opts +++ b/test/memorygrowth.fromasm.no-opts @@ -193,7 +193,7 @@ ) (block (set_local $d - (if + (if i32 (i32.lt_u (get_local $a) (i32.const 11) @@ -1009,7 +1009,7 @@ ) ) (set_local $e - (if + (if i32 (get_local $f) (get_local $j) (get_local $e) @@ -1019,7 +1019,7 @@ (get_local $B) ) (set_local $s - (if + (if i32 (get_local $f) (get_local $B) (get_local $s) @@ -1886,7 +1886,7 @@ (set_local $s (i32.shl (get_local $e) - (if + (if i32 (i32.eq (get_local $J) (i32.const 31) @@ -1996,7 +1996,7 @@ ) ) (set_local $m - (if + (if i32 (i32.or (i32.eq (get_local $l) @@ -2286,14 +2286,14 @@ ) ) (set_local $g - (if + (if i32 (get_local $s) (get_local $i) (get_local $O) ) ) (set_local $i - (if + (if i32 (get_local $s) (get_local $P) (get_local $Q) @@ -3213,7 +3213,7 @@ (set_local $q (i32.shl (get_local $U) - (if + (if i32 (i32.eq (get_local $ba) (i32.const 31) @@ -4434,7 +4434,7 @@ ) ) (set_local $c - (if + (if i32 (i32.eq (i32.and (get_local $ma) @@ -4610,7 +4610,7 @@ ) ) (set_local $ca - (if + (if i32 (i32.eq (i32.and (get_local $ka) @@ -4806,7 +4806,7 @@ (set_local $ca (i32.add (get_local $ha) - (if + (if i32 (i32.eq (i32.and (get_local $ka) @@ -4834,7 +4834,7 @@ (set_local $ma (i32.add (get_local $c) - (if + (if i32 (i32.eq (i32.and (get_local $ka) @@ -5939,7 +5939,7 @@ (set_local $aa (i32.shl (get_local $Ea) - (if + (if i32 (i32.eq (get_local $Ha) (i32.const 31) @@ -6236,7 +6236,7 @@ (set_local $ka (i32.add (get_local $ca) - (if + (if i32 (i32.eq (i32.and (get_local $ea) @@ -6262,7 +6262,7 @@ ) ) (set_local $ca - (if + (if i32 (i32.lt_u (get_local $ka) (get_local $ea) @@ -6284,7 +6284,7 @@ ) ) (set_local $c - (if + (if i32 (i32.eq (i32.and (get_local $ma) @@ -6789,7 +6789,7 @@ (set_local $ma (i32.shl (get_local $ka) - (if + (if i32 (i32.eq (get_local $Oa) (i32.const 31) @@ -9023,7 +9023,7 @@ (set_local $F (i32.shl (get_local $D) - (if + (if i32 (i32.eq (get_local $G) (i32.const 31) diff --git a/test/passes/O.wast b/test/passes/O.wast index 8b94d39fc..e93a5b8d9 100644 --- a/test/passes/O.wast +++ b/test/passes/O.wast @@ -1,6 +1,6 @@ (module (func $ret (result i32) - (block $out + (block $out i32 (drop (call $ret)) (if (call $ret) (return diff --git a/test/passes/dce.txt b/test/passes/dce.txt index 6e70cd8de..a5843e73d 100644 --- a/test/passes/dce.txt +++ b/test/passes/dce.txt @@ -47,15 +47,21 @@ ) (if (i32.const 0) - (unreachable) + (drop + (unreachable) + ) ) (if (i32.const 0) - (unreachable) + (drop + (unreachable) + ) ) (if (i32.const 0) - (unreachable) + (drop + (unreachable) + ) ) (block $out (block $in diff --git a/test/passes/dce.wast b/test/passes/dce.wast index 9795bda80..af85945b4 100644 --- a/test/passes/dce.wast +++ b/test/passes/dce.wast @@ -84,40 +84,46 @@ ) (if (i32.const 0) - (block $out - (br $out + (drop + (block $out i32 + (br $out + (unreachable) + ) + (drop + (i32.const 0) + ) (unreachable) ) - (drop - (i32.const 0) - ) - (unreachable) ) ) (if (i32.const 0) - (block $out - (br_if $out + (drop + (block $out i32 + (br_if $out + (unreachable) + (i32.const 0) + ) + (drop + (i32.const 0) + ) (unreachable) - (i32.const 0) ) - (drop - (i32.const 0) - ) - (unreachable) ) ) (if (i32.const 0) - (block $out - (br_if $out - (unreachable) + (drop + (block $out i32 + (br_if $out + (unreachable) + (unreachable) + ) + (drop + (i32.const 0) + ) (unreachable) ) - (drop - (i32.const 0) - ) - (unreachable) ) ) (block $out diff --git a/test/passes/duplicate-function-elimination.wast b/test/passes/duplicate-function-elimination.wast index ba429ed30..f8fe1d4fb 100644 --- a/test/passes/duplicate-function-elimination.wast +++ b/test/passes/duplicate-function-elimination.wast @@ -351,7 +351,7 @@ (type $0 (func)) (func $keep2 (type $0) (drop - (block $foo + (block $foo i32 (br_table $foo $foo (i32.const 0) (i32.const 0) @@ -361,7 +361,7 @@ ) (func $other (type $0) (drop - (block $bar + (block $bar i32 (br_table $bar $bar (i32.const 0) (i32.const 1) diff --git a/test/passes/metrics.txt b/test/passes/metrics.txt index e5024b1af..1310d9363 100644 --- a/test/passes/metrics.txt +++ b/test/passes/metrics.txt @@ -39,7 +39,7 @@ Counts ) (drop (i32.eq - (if + (if i32 (i32.const 4) (i32.const 5) (i32.const 6) diff --git a/test/passes/metrics.wast b/test/passes/metrics.wast index c1f278daa..76622bbf1 100644 --- a/test/passes/metrics.wast +++ b/test/passes/metrics.wast @@ -30,7 +30,7 @@ ) (drop (i32.eq - (if + (if i32 (i32.const 4) (i32.const 5) (i32.const 6) diff --git a/test/passes/nm.wast b/test/passes/nm.wast index 8cea1e648..58c326745 100644 --- a/test/passes/nm.wast +++ b/test/passes/nm.wast @@ -6,7 +6,7 @@ ) (func $b (type $0) (drop - (loop $loop-in1 + (loop $loop-in1 i32 (nop) (i32.const 1000) ) diff --git a/test/passes/precompute.wast b/test/passes/precompute.wast index 17b02b336..b498d9df0 100644 --- a/test/passes/precompute.wast +++ b/test/passes/precompute.wast @@ -53,7 +53,7 @@ (br $c) ) (drop - (block $val + (block $val i32 (drop (br_if $val (i32.const 100) (i32.const 0))) (call $x (i32.const 4)) (drop (br_if $val (i32.const 101) (i32.const 1))) @@ -68,7 +68,7 @@ ) ) (drop - (block $d + (block $d i32 (call $x (i32.const 5)) (block $e (drop (br_if $d (br $e) (i32.const 1))) @@ -81,7 +81,7 @@ ) ) (drop - (block $d + (block $d i32 (call $x (i32.const 6)) (block $e (drop (br_if $d (br $e) (i32.const 0))) @@ -93,7 +93,7 @@ ) ) (drop - (block $d + (block $d i32 (call $x (i32.const 7)) (block $e (drop (br_if $d (i32.const 1) (br $e))) @@ -102,7 +102,7 @@ ) ) (call $x - (block $out + (block $out i32 (block $waka1 (block $waka2 (block $waka3 @@ -118,7 +118,7 @@ ) ) (call $x - (block $out + (block $out i32 (block $waka1 (block $waka2 (block $waka3 @@ -134,7 +134,7 @@ ) ) (call $x - (block $out + (block $out i32 (block $waka1 (block $waka2 (block $waka3 @@ -150,7 +150,7 @@ ) ) (call $x - (block $out + (block $out i32 (block $waka1 (block $waka2 (block $waka3 diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt index 33ec51ea5..a5156a4bf 100644 --- a/test/passes/remove-unused-brs.txt +++ b/test/passes/remove-unused-brs.txt @@ -721,7 +721,7 @@ (i32.const 6) ) ) - (if + (if i32 (i32.const 6) (br $outval (i32.const 7) diff --git a/test/passes/remove-unused-brs.wast b/test/passes/remove-unused-brs.wast index 24995b235..7a401b893 100644 --- a/test/passes/remove-unused-brs.wast +++ b/test/passes/remove-unused-brs.wast @@ -151,7 +151,7 @@ ) ) (func $b13 (type $2) (result i32) - (block $topmost + (block $topmost i32 (if (i32.const 1) (block $block1 @@ -178,13 +178,13 @@ ) ) (func $b14 (type $2) (result i32) - (block $topmost - (if + (block $topmost i32 + (if i32 (i32.const 1) - (block $block1 + (block $block1 i32 (i32.const 12) ) - (block $block3 + (block $block3 i32 (i32.const 27) ) ) @@ -355,7 +355,7 @@ ) ) (if - (block $block6 + (block $block6 i32 (block (drop (i32.const 2) @@ -372,7 +372,7 @@ ) ) (if - (block $a + (block $a i32 (br $a (i32.const 0) ) @@ -440,7 +440,7 @@ (i32.const 1) ) ) - (block $do-once$0 + (block $do-once$0 i32 (if (tee_local $x (i32.const 1) @@ -606,7 +606,7 @@ (call $loops) ) (drop - (block $out2 + (block $out2 i32 (br $out2 (i32.const 1)) ) ) @@ -656,7 +656,7 @@ ) ) (func $br_if_in_block (result i32) - (block $outval + (block $outval i32 (block $in (if (i32.const 1) (br $in) (br $in)) (drop (i32.const 2)) @@ -665,13 +665,13 @@ (if (i32.const 5) (br $in) (unreachable)) (drop (i32.const 6)) ) - (if (i32.const 6) (br $outval (i32.const 7)) (i32.const 8)) + (if i32 (i32.const 6) (br $outval (i32.const 7)) (i32.const 8)) ) ) (func $threading (drop - (block $value-out - (block $value-in + (block $value-out i32 + (block $value-in i32 (block $out (block $in (if (i32.const 1) @@ -705,11 +705,11 @@ (func $if-to-br_if-conflict (param $x i32) (param $y i32) (result i32) (block $leave (set_local $y - (block $out + (block $out i32 (if (get_local $x) (br $out - (block + (block i32 (set_local $x (i32.const 0)) (i32.const 1) ) @@ -725,12 +725,12 @@ (func $if-to-br_if-conflict2 (param $x i32) (param $y i32) (result i32) (block $leave (set_local $y - (block $out + (block $out i32 (if (get_local $x) (br_if $leave (i32.const 1)) (br $out - (block + (block i32 (set_local $x (i32.const 0)) (i32.const 1) ) @@ -745,11 +745,11 @@ (func $if-to-br_if-value-sideeffect (param $x i32) (param $y i32) (result i32) (block $leave (set_local $y - (block $out + (block $out i32 (if (get_local $x) (br $out - (block + (block i32 (drop (call $if-to-br_if-value-sideeffect (i32.const 0) (i32.const 1))) (nop) (i32.const 1) diff --git a/test/passes/remove-unused-names.wast b/test/passes/remove-unused-names.wast index c8efa0c15..675e52df1 100644 --- a/test/passes/remove-unused-names.wast +++ b/test/passes/remove-unused-names.wast @@ -3,7 +3,7 @@ (type $0 (func (param i32) (result i32))) (type $1 (func)) (func $b0 (type $0) (param $i1 i32) (result i32) - (block $topmost + (block $topmost i32 (i32.const 0) ) ) diff --git a/test/passes/remove-unused-names_merge-blocks.wast b/test/passes/remove-unused-names_merge-blocks.wast index 64bc8ab7f..895eae2aa 100644 --- a/test/passes/remove-unused-names_merge-blocks.wast +++ b/test/passes/remove-unused-names_merge-blocks.wast @@ -156,14 +156,14 @@ (local $x i32) (drop (i32.eqz - (block $block0 + (block $block0 i32 (i32.const 10) ) ) ) (drop (i32.eqz - (block $block1 + (block $block1 i32 (drop (i32.const 10) ) @@ -173,7 +173,7 @@ ) (drop (i32.eqz - (block $block2 + (block $block2 i32 (drop (i32.const 10) ) @@ -185,7 +185,7 @@ ) ) (set_local $x - (block $block3 + (block $block3 i32 (drop (i32.const 10) ) @@ -194,7 +194,7 @@ ) (drop (i32.load - (block $block4 + (block $block4 i32 (drop (i32.const 10) ) @@ -214,7 +214,7 @@ (func $binary (type $3) (drop (i32.add - (block $block0 + (block $block0 i32 (i32.const 10) ) (i32.const 20) @@ -222,7 +222,7 @@ ) (drop (i32.add - (block $block1 + (block $block1 i32 (drop (i32.const 10) ) @@ -233,7 +233,7 @@ ) (drop (i32.add - (block $block2 + (block $block2 i32 (drop (i32.const 10) ) @@ -248,7 +248,7 @@ (drop (i32.add (i32.const 10) - (block $block3 + (block $block3 i32 (i32.const 20) ) ) @@ -256,7 +256,7 @@ (drop (i32.add (i32.const 10) - (block $block4 + (block $block4 i32 (drop (i32.const 20) ) @@ -267,7 +267,7 @@ (drop (i32.add (i32.const 10) - (block $block5 + (block $block5 i32 (drop (i32.const 20) ) @@ -280,23 +280,23 @@ ) (drop (i32.add - (block $block6 + (block $block6 i32 (i32.const 10) ) - (block $block7 + (block $block7 i32 (i32.const 20) ) ) ) (drop (i32.add - (block $block8 + (block $block8 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block9 + (block $block9 i32 (drop (i32.const 30) ) @@ -306,7 +306,7 @@ ) (drop (i32.add - (block $block10 + (block $block10 i32 (drop (i32.const 10) ) @@ -315,7 +315,7 @@ ) (i32.const 30) ) - (block $block11 + (block $block11 i32 (drop (i32.const 40) ) @@ -328,7 +328,7 @@ ) (i32.store (i32.const 10) - (block $block12 + (block $block12 i32 (drop (i32.const 20) ) @@ -336,7 +336,7 @@ ) ) (i32.store - (block $block13 + (block $block13 i32 (drop (i32.const 10) ) @@ -347,7 +347,7 @@ (drop (i32.add (unreachable) - (block $block14 + (block $block14 i32 (drop (i32.const 10) ) @@ -357,11 +357,11 @@ ) (drop (i32.add - (block $block15 + (block $block15 i32 (unreachable) (i32.const 10) ) - (block $block16 + (block $block16 i32 (drop (i32.const 20) ) @@ -373,19 +373,19 @@ (func $trinary (type $3) (drop (select - (block $block0 + (block $block0 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block1 + (block $block1 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block2 + (block $block2 i32 (drop (i32.const 50) ) @@ -395,16 +395,16 @@ ) (drop (select - (block $block3 + (block $block3 i32 (i32.const 10) ) - (block $block4 + (block $block4 i32 (drop (i32.const 20) ) (i32.const 30) ) - (block $block5 + (block $block5 i32 (drop (i32.const 40) ) @@ -414,16 +414,16 @@ ) (drop (select - (block $block6 + (block $block6 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block7 + (block $block7 i32 (i32.const 30) ) - (block $block8 + (block $block8 i32 (drop (i32.const 40) ) @@ -433,32 +433,32 @@ ) (drop (select - (block $block9 + (block $block9 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block10 + (block $block10 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block11 + (block $block11 i32 (i32.const 50) ) ) ) (drop (select - (block $block12 + (block $block12 i32 (i32.const 10) ) - (block $block13 + (block $block13 i32 (i32.const 20) ) - (block $block14 + (block $block14 i32 (drop (i32.const 30) ) @@ -468,49 +468,49 @@ ) (drop (select - (block $block15 + (block $block15 i32 (i32.const 10) ) - (block $block16 + (block $block16 i32 (drop (i32.const 20) ) (i32.const 30) ) - (block $block17 + (block $block17 i32 (i32.const 40) ) ) ) (drop (select - (block $block18 + (block $block18 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block19 + (block $block19 i32 (i32.const 30) ) - (block $block20 + (block $block20 i32 (i32.const 40) ) ) ) (drop (select - (block $block21 + (block $block21 i32 (unreachable) (i32.const 20) ) - (block $block22 + (block $block22 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block23 + (block $block23 i32 (drop (i32.const 50) ) @@ -520,19 +520,19 @@ ) (drop (select - (block $block24 + (block $block24 i32 (drop (i32.const 10) ) (unreachable) ) - (block $block25 + (block $block25 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block26 + (block $block26 i32 (drop (i32.const 50) ) @@ -542,17 +542,17 @@ ) (drop (select - (block $block27 + (block $block27 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block28 + (block $block28 i32 (unreachable) (i32.const 40) ) - (block $block29 + (block $block29 i32 (drop (i32.const 50) ) @@ -562,19 +562,19 @@ ) (drop (select - (block $block30 + (block $block30 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block31 + (block $block31 i32 (drop (i32.const 30) ) (unreachable) ) - (block $block32 + (block $block32 i32 (drop (i32.const 50) ) @@ -584,19 +584,19 @@ ) (drop (select - (block $block33 + (block $block33 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block34 + (block $block34 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block35 + (block $block35 i32 (unreachable) (i32.const 60) ) @@ -604,19 +604,19 @@ ) (drop (select - (block $block36 + (block $block36 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block37 + (block $block37 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block38 + (block $block38 i32 (drop (i32.const 50) ) @@ -629,7 +629,7 @@ (block $out (block (drop - (block $block0 + (block $block0 i32 (drop (i32.const 10) ) @@ -639,7 +639,7 @@ (br $out) ) (br_if $out - (block $block1 + (block $block1 i32 (drop (i32.const 10) ) @@ -648,7 +648,7 @@ ) (block (drop - (block $block2 + (block $block2 i32 (drop (i32.const 10) ) @@ -656,7 +656,7 @@ ) ) (br_if $out - (block $block3 + (block $block3 i32 (drop (i32.const 30) ) @@ -665,7 +665,7 @@ ) ) (br_table $out $out - (block $block4 + (block $block4 i32 (drop (i32.const 10) ) @@ -673,15 +673,15 @@ ) ) (drop - (block $out2 + (block $out2 i32 (br_table $out2 $out2 - (block $block5 + (block $block5 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block6 + (block $block6 i32 (drop (i32.const 30) ) @@ -695,12 +695,12 @@ ) (func $calls (type $3) (call $call-i - (block $block0 + (block $block0 i32 (i32.const 10) ) ) (call $call-i - (block $block1 + (block $block1 i32 (drop (i32.const 10) ) @@ -708,7 +708,7 @@ ) ) (call $call-i - (block $block2 + (block $block2 i32 (drop (i32.const 10) ) @@ -719,13 +719,13 @@ ) ) (call $call-ii - (block $block3 + (block $block3 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block4 + (block $block4 i32 (drop (i32.const 30) ) @@ -733,11 +733,11 @@ ) ) (call $call-ii - (block $block5 + (block $block5 i32 (unreachable) (i32.const 10) ) - (block $block6 + (block $block6 i32 (drop (i32.const 20) ) @@ -745,13 +745,13 @@ ) ) (call $call-ii - (block $block7 + (block $block7 i32 (drop (i32.const 10) ) (unreachable) ) - (block $block8 + (block $block8 i32 (drop (i32.const 20) ) @@ -759,25 +759,25 @@ ) ) (call $call-ii - (block $block9 + (block $block9 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block10 + (block $block10 i32 (unreachable) (i32.const 30) ) ) (call $call-ii - (block $block11 + (block $block11 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block12 + (block $block12 i32 (drop (i32.const 30) ) @@ -785,19 +785,19 @@ ) ) (call $call-iii - (block $block13 + (block $block13 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block14 + (block $block14 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block15 + (block $block15 i32 (drop (i32.const 50) ) @@ -805,14 +805,14 @@ ) ) (call $call-iii - (block $block16 + (block $block16 i32 (drop (i32.const 10) ) (i32.const 20) ) (i32.const 30) - (block $block17 + (block $block17 i32 (drop (i32.const 40) ) @@ -820,19 +820,19 @@ ) ) (call_indirect $ii - (block $block18 + (block $block18 i32 (drop (i32.const 10) ) (i32.const 20) ) - (block $block19 + (block $block19 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block20 + (block $block20 i32 (drop (i32.const 50) ) @@ -841,13 +841,13 @@ ) (call_indirect $ii (unreachable) - (block $block21 + (block $block21 i32 (drop (i32.const 30) ) (i32.const 40) ) - (block $block22 + (block $block22 i32 (drop (i32.const 50) ) @@ -861,7 +861,7 @@ (if (f64.gt (get_local $0) - (block $block0 + (block $block0 f64 (nop) (get_local $1) ) diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt index 15cd59140..58191acf5 100644 --- a/test/passes/simplify-locals.txt +++ b/test/passes/simplify-locals.txt @@ -426,7 +426,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -444,7 +444,7 @@ (tee_local $$1$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -455,7 +455,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -484,7 +484,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -502,7 +502,7 @@ (tee_local $$2$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -513,7 +513,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -599,7 +599,7 @@ ) (block $waka2 (set_local $x - (if + (if i32 (i32.const 1) (block i32 (nop) @@ -615,7 +615,7 @@ ) (br_if $out (tee_local $x - (if + (if i32 (i32.const 1) (block $block3 i32 (nop) @@ -739,7 +739,7 @@ (func $drop-if-value (type $9) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $temp i32) (drop - (if + (if i32 (get_local $x) (block $block53 i32 (nop) diff --git a/test/passes/simplify-locals.wast b/test/passes/simplify-locals.wast index a998daf5f..c24f8bdc9 100644 --- a/test/passes/simplify-locals.wast +++ b/test/passes/simplify-locals.wast @@ -264,7 +264,7 @@ ) (call $waka) (set_local $a - (block + (block i32 (block (set_local $5 (i32.const 105) @@ -282,7 +282,7 @@ ) (call $waka) (set_local $a - (block + (block i32 (block (set_local $6 (i32.const 107) @@ -301,7 +301,7 @@ ) (call $waka) (set_local $a - (block + (block i32 (block (set_local $7 (i32.const 109) @@ -324,7 +324,7 @@ ) (call $waka) (set_local $a - (block + (block i32 (block (set_local $8 (i32.const 111) @@ -367,7 +367,7 @@ (i32.const 1337) ) (drop - (loop $loop-in5 + (loop $loop-in5 i32 (drop (get_local $a) ) @@ -466,7 +466,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -481,7 +481,7 @@ (set_local $$1$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -492,7 +492,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$a$1) (i32.const 0) @@ -511,7 +511,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -526,7 +526,7 @@ (set_local $$2$1 (i32.or (i32.shr_s - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -537,7 +537,7 @@ (i32.const 31) ) (i32.shl - (if + (if i32 (i32.lt_s (get_local $$b$1) (i32.const 0) @@ -618,7 +618,7 @@ (get_local $__stackBase__) ) (return - (block $block12 + (block $block12 i32 (i32.store (i32.const 168) (get_local $$10$1) @@ -735,7 +735,7 @@ (func $no-out-of-label (param $x i32) (param $y i32) (loop $moar (set_local $x - (block + (block i32 (br_if $moar (get_local $x)) (i32.const 0) ) @@ -744,7 +744,7 @@ (drop (get_local $x)) (block $moar (set_local $y - (block + (block i32 (br_if $moar (get_local $y)) (i32.const 0) ) @@ -778,7 +778,7 @@ (func $drop-if-value (param $x i32) (param $y i32) (param $z i32) (result i32) (local $temp i32) (drop - (if + (if i32 (get_local $x) (block $block53 i32 (nop) diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt index 73be2fea4..74f03b3e9 100644 --- a/test/passes/vacuum.txt +++ b/test/passes/vacuum.txt @@ -121,7 +121,7 @@ ) (func $Gu (type $4) (param $b i32) (param $e f64) (param $l i32) (param $d i32) (if - (if + (if i32 (get_local $d) (block $block1 i32 (f64.ne @@ -145,17 +145,17 @@ ) (func $if-drop (type $3) (result i32) (block $out - (if - (call $if-drop) - (drop + (drop + (if + (call $if-drop) (call $int) + (br $out) ) - (br $out) ) - (if - (call $if-drop) - (br $out) - (drop + (drop + (if + (call $if-drop) + (br $out) (call $int) ) ) @@ -210,7 +210,7 @@ ) (func $if2drops (type $3) (result i32) (drop - (if + (if i32 (call $if2drops) (call $if2drops) (call $if2drops) diff --git a/test/passes/vacuum.wast b/test/passes/vacuum.wast index 559deb971..9095a40f4 100644 --- a/test/passes/vacuum.wast +++ b/test/passes/vacuum.wast @@ -87,12 +87,12 @@ ) ) (set_local $x - (block $result-used + (block $result-used i32 (get_local $x) ) ) (set_local $x - (block $two-and-result-used + (block $two-and-result-used i32 (drop (get_local $x) ) @@ -109,7 +109,7 @@ (nop) ) (drop - (loop $loop-in5 + (loop $loop-in5 i32 (drop (get_local $0) ) @@ -276,9 +276,9 @@ ) (func $Gu (type $4) (param $b i32) (param $e f64) (param $l i32) (param $d i32) (if - (if + (if i32 (get_local $d) - (block $block1 + (block $block1 i32 (nop) (f64.ne (f64.promote/f32 @@ -358,7 +358,7 @@ ) (func $drop-get-global (drop - (block + (block i32 (call $drop-get-global) (get_global $Int) ;; this is not needed due to the block being drop'd, but make sure the call is not then dropped either ) @@ -369,7 +369,7 @@ (local $$11 i32) (loop $while-in$1 (drop - (block $jumpthreading$outer$8 + (block $jumpthreading$outer$8 i32 (block $jumpthreading$inner$8 (br $jumpthreading$outer$8 ;; the rest is dead in the outer block, but be careful to leave the return value! (i32.const 0) @@ -387,7 +387,7 @@ (func $relooperJumpThreading2 (loop $while-in$1 (drop - (block $jumpthreading$outer$8 + (block $jumpthreading$outer$8 i32 (block $jumpthreading$inner$8 (br $jumpthreading$outer$8 (i32.const 0) @@ -401,7 +401,7 @@ (func $relooperJumpThreading3 (loop $while-in$1 (drop - (block $jumpthreading$outer$8 + (block $jumpthreading$outer$8 i32 (br $jumpthreading$outer$8 ;; code after this is dead, can kill it, but preserve the return value at the end! (i32.const 0) ) diff --git a/test/two_sides.fromasm b/test/two_sides.fromasm index e6595d04b..2f5c31458 100644 --- a/test/two_sides.fromasm +++ b/test/two_sides.fromasm @@ -9,7 +9,7 @@ (export "_test" (func $_test)) (func $_test (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32) (local $5 f64) - (if + (if i32 (get_local $4) (call $f64-to-int (f64.mul diff --git a/test/two_sides.fromasm.imprecise b/test/two_sides.fromasm.imprecise index 428c56a97..c7b262bcd 100644 --- a/test/two_sides.fromasm.imprecise +++ b/test/two_sides.fromasm.imprecise @@ -6,7 +6,7 @@ (export "_test" (func $_test)) (func $_test (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32) (local $5 f64) - (if + (if i32 (get_local $4) (i32.trunc_s/f64 (f64.mul diff --git a/test/unit.fromasm b/test/unit.fromasm index e08babd28..15d41d43c 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -593,7 +593,7 @@ ) (func $conditionalTypeFun (drop - (if + (if i32 (call $return_int) (i32.trunc_s/f64 (call $abort @@ -606,7 +606,7 @@ ) ) (drop - (if + (if f64 (call $return_int) (call $abort (f64.convert_s/i32 @@ -1027,7 +1027,7 @@ ) (func $dropIgnoredImportsInIf (param $0 i32) (param $1 i32) (param $2 i32) (drop - (if + (if i32 (get_local $0) (call $lb (get_local $1) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index f99b02e82..c5481b944 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -574,7 +574,7 @@ ) (func $conditionalTypeFun (drop - (if + (if i32 (call $return_int) (i32.trunc_s/f64 (call $abort @@ -587,7 +587,7 @@ ) ) (drop - (if + (if f64 (call $return_int) (call $abort (f64.convert_s/i32 @@ -1008,7 +1008,7 @@ ) (func $dropIgnoredImportsInIf (param $0 i32) (param $1 i32) (param $2 i32) (drop - (if + (if i32 (get_local $0) (call $lb (get_local $1) diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts index 16a10861b..ba1102aa2 100644 --- a/test/unit.fromasm.imprecise.no-opts +++ b/test/unit.fromasm.imprecise.no-opts @@ -985,7 +985,7 @@ (local $x i32) (local $y f64) (set_local $x - (if + (if i32 (call $return_int) (i32.trunc_s/f64 (call $abort @@ -998,7 +998,7 @@ ) ) (set_local $y - (if + (if f64 (call $return_int) (call $abort (f64.convert_s/i32 diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts index 58f63e66c..341593beb 100644 --- a/test/unit.fromasm.no-opts +++ b/test/unit.fromasm.no-opts @@ -991,7 +991,7 @@ (local $x i32) (local $y f64) (set_local $x - (if + (if i32 (call $return_int) (i32.trunc_s/f64 (call $abort @@ -1004,7 +1004,7 @@ ) ) (set_local $y - (if + (if f64 (call $return_int) (call $abort (f64.convert_s/i32 |