diff options
-rw-r--r-- | src/passes/RelooperJumpThreading.cpp | 6 | ||||
-rw-r--r-- | test/emcc_hello_world.fromasm | 260 | ||||
-rw-r--r-- | test/emcc_hello_world.fromasm.imprecise | 260 | ||||
-rw-r--r-- | test/unit.fromasm | 64 | ||||
-rw-r--r-- | test/unit.fromasm.imprecise | 64 |
5 files changed, 327 insertions, 327 deletions
diff --git a/src/passes/RelooperJumpThreading.cpp b/src/passes/RelooperJumpThreading.cpp index bd257c568..e382bdec1 100644 --- a/src/passes/RelooperJumpThreading.cpp +++ b/src/passes/RelooperJumpThreading.cpp @@ -29,7 +29,7 @@ static Name LABEL("label"); // We need to use new label names, which we cannot create in parallel, so pre-create them -const Index MAX_NAME_INDEX = 1000; +const Index MAX_NAME_INDEX = 10000; std::vector<Name>* innerNames = nullptr; std::vector<Name>* outerNames = nullptr; @@ -41,8 +41,8 @@ struct NameEnsurer { innerNames = new std::vector<Name>; outerNames = new std::vector<Name>; for (Index i = 0; i < MAX_NAME_INDEX; i++) { - innerNames->push_back(Name(std::string("jumpthreading$inner$") + std::to_string(i))); - outerNames->push_back(Name(std::string("jumpthreading$outer$") + std::to_string(i))); + innerNames->push_back(Name(std::string("__rjti$") + std::to_string(i))); + outerNames->push_back(Name(std::string("__rjto$") + std::to_string(i))); } } }; diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index 00c9635ad..06f88befe 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -306,11 +306,11 @@ (set_local $1 (i32.const 0) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eq (i32.load8_u offset=687 (get_local $1) @@ -335,7 +335,7 @@ (set_local $0 (i32.const 775) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) ) (if @@ -344,13 +344,13 @@ (set_local $0 (i32.const 775) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) (set_local $0 (i32.const 775) ) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (loop $while-in1 (loop $while-in3 @@ -871,9 +871,9 @@ (get_local $2) ) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in (if (i32.load @@ -935,13 +935,13 @@ ) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eq (get_local $12) (get_local $3) ) ) - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.lt_s (get_local $3) (i32.const 0) @@ -1070,7 +1070,7 @@ (get_local $11) (get_local $1) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (i32.store offset=16 (get_local $0) @@ -1412,8 +1412,8 @@ (local $5 i32) (local $6 i32) (block $label$break$L5 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjti$0 + (br_if $__rjti$0 (tee_local $3 (i32.load (tee_local $4 @@ -1438,7 +1438,7 @@ (get_local $4) ) ) - (br $jumpthreading$inner$0) + (br $__rjti$0) ) ) (br $label$break$L5) @@ -1866,8 +1866,8 @@ ) ) (block $label$break$L8 - (block $jumpthreading$inner$2 - (block $jumpthreading$inner$1 + (block $__rjti$2 + (block $__rjti$1 (if (i32.and (tee_local $4 @@ -1915,7 +1915,7 @@ (set_local $0 (get_local $3) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) ) (br_if $while-in @@ -1945,7 +1945,7 @@ ) ) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) ) (block @@ -1967,7 +1967,7 @@ (set_local $0 (get_local $3) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) (set_local $0 (i32.const 0) @@ -2000,9 +2000,9 @@ (i32.const 16843009) ) ) - (block $jumpthreading$outer$0 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjto$0 + (block $__rjti$0 + (br_if $__rjti$0 (i32.le_u (get_local $0) (i32.const 3) @@ -2050,11 +2050,11 @@ (i32.const 3) ) ) - (br $jumpthreading$inner$0) + (br $__rjti$0) ) ) ) - (br $jumpthreading$outer$0) + (br $__rjto$0) ) (if (i32.eqz @@ -2137,9 +2137,9 @@ (local $5 i32) (local $6 i32) (tee_local $0 - (block $jumpthreading$outer$0 i32 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjto$0 i32 + (block $__rjti$0 + (br_if $__rjti$0 (i32.le_u (i32.load (tee_local $1 @@ -2175,12 +2175,12 @@ ) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.load (get_local $1) ) ) - (br $jumpthreading$outer$0 + (br $__rjto$0 (i32.const -1) ) ) @@ -2460,7 +2460,7 @@ (i32.const 0) ) (block $label$break$L343 - (block $jumpthreading$inner$9 + (block $__rjti$9 (loop $label$continue$L1 (block $label$break$L1 (if @@ -2491,7 +2491,7 @@ ) ) ) - (br_if $jumpthreading$inner$9 + (br_if $__rjti$9 (i32.eqz (i32.shr_s (i32.shl @@ -2510,7 +2510,7 @@ (get_local $5) ) (block $label$break$L12 - (block $jumpthreading$inner$1 + (block $__rjti$1 (loop $label$continue$L9 (block $label$break$L9 (block $switch-default @@ -2532,7 +2532,7 @@ (set_local $6 (get_local $10) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) (set_local $6 (get_local $10) @@ -2819,9 +2819,9 @@ ) (block (set_local $10 - (block $jumpthreading$outer$0 i32 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjto$0 i32 + (block $__rjti$0 + (br_if $__rjti$0 (i32.ge_u (tee_local $11 (i32.add @@ -2839,7 +2839,7 @@ (i32.const 10) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.ne (i32.load8_s offset=2 (get_local $10) @@ -2879,7 +2879,7 @@ (get_local $6) ) ) - (br $jumpthreading$outer$0 + (br $__rjto$0 (i32.add (get_local $10) (i32.const 3) @@ -3385,8 +3385,8 @@ (i32.const -1) ) ) - (block $jumpthreading$outer$2 - (block $jumpthreading$inner$2 + (block $__rjto$2 + (block $__rjti$2 (if (i32.eq (i32.shr_s @@ -3406,7 +3406,7 @@ ) (br $label$break$L1) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) (block (if @@ -3447,7 +3447,7 @@ (get_local $8) (get_local $13) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) ) (if @@ -3468,7 +3468,7 @@ ) ) ) - (br $jumpthreading$outer$2) + (br $__rjto$2) ) (if (i32.eqz @@ -3500,13 +3500,13 @@ ) ) ) - (block $jumpthreading$outer$8 - (block $jumpthreading$inner$8 - (block $jumpthreading$inner$7 - (block $jumpthreading$inner$6 - (block $jumpthreading$inner$5 - (block $jumpthreading$inner$4 - (block $jumpthreading$inner$3 + (block $__rjto$8 + (block $__rjti$8 + (block $__rjti$7 + (block $__rjti$6 + (block $__rjti$5 + (block $__rjti$4 + (block $__rjti$3 (block $switch-default120 (block $switch-case42 (block $switch-case41 @@ -3722,12 +3722,12 @@ (set_local $18 (i32.const 120) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (set_local $7 (get_local $11) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (if (i32.and @@ -3836,7 +3836,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (block (set_local $5 @@ -3851,7 +3851,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) ) ) @@ -3897,7 +3897,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) ) (if @@ -3912,7 +3912,7 @@ (set_local $9 (i32.const 4092) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) (block (set_local $8 @@ -3930,7 +3930,7 @@ (get_local $9) ) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) ) ) @@ -3952,7 +3952,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) (set_local $5 (get_local $19) @@ -3981,7 +3981,7 @@ (set_local $5 (get_local $22) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $5 (call $_strerror @@ -3990,7 +3990,7 @@ ) ) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) (set_local $5 (select @@ -4003,7 +4003,7 @@ (get_local $5) ) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) (set_local $5 (get_local $19) @@ -4025,7 +4025,7 @@ (set_local $8 (i32.const -1) ) - (br $jumpthreading$inner$6) + (br $__rjti$6) ) (if (get_local $6) @@ -4033,7 +4033,7 @@ (set_local $8 (get_local $6) ) - (br $jumpthreading$inner$6) + (br $__rjti$6) ) (block (call $_pad @@ -4046,7 +4046,7 @@ (set_local $7 (i32.const 0) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) ) @@ -6544,7 +6544,7 @@ (set_local $5 (get_local $22) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $9 (i32.and @@ -6581,7 +6581,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (block (set_local $5 @@ -6665,7 +6665,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (block (set_local $8 @@ -6680,12 +6680,12 @@ (i32.const 4091) ) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) ) ) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $5 (call $_fmt_u @@ -6697,7 +6697,7 @@ (set_local $7 (get_local $11) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (set_local $18 (i32.eqz @@ -6742,7 +6742,7 @@ (get_local $18) ) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $5 (i32.const 0) @@ -6848,7 +6848,7 @@ (set_local $7 (get_local $5) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) (if @@ -6870,7 +6870,7 @@ (set_local $7 (get_local $5) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) (if @@ -6905,17 +6905,17 @@ (set_local $7 (get_local $5) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) (block (set_local $7 (i32.const 0) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (call $_pad (get_local $0) @@ -9316,9 +9316,9 @@ (get_local $2) ) ) - (block $jumpthreading$outer$3 - (block $jumpthreading$inner$3 - (block $jumpthreading$inner$2 + (block $__rjto$3 + (block $__rjti$3 + (block $__rjti$2 (if (tee_local $0 (i32.load offset=480 @@ -9384,7 +9384,7 @@ (set_local $3 (get_local $0) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (block (set_local $3 @@ -9456,7 +9456,7 @@ (set_local $0 (get_local $1) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) (block (set_local $6 @@ -9629,13 +9629,13 @@ (set_local $3 (get_local $4) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (set_local $4 (get_local $0) ) ) - (br $jumpthreading$outer$3) + (br $__rjto$3) ) (loop $while-in16 (set_local $9 @@ -10407,11 +10407,11 @@ (get_local $2) ) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in28 - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eq (i32.and (i32.load offset=4 @@ -10428,7 +10428,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eqz (tee_local $1 (i32.load @@ -10488,7 +10488,7 @@ (br $do-once25) ) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (if (i32.and @@ -10853,8 +10853,8 @@ (i32.const 48) ) ) - (block $jumpthreading$outer$13 - (block $jumpthreading$inner$13 + (block $__rjto$13 + (block $__rjti$13 (if (i32.eqz (i32.and @@ -10866,9 +10866,9 @@ ) (block (block $label$break$L279 - (block $jumpthreading$inner$5 - (block $jumpthreading$inner$4 - (br_if $jumpthreading$inner$4 + (block $__rjti$5 + (block $__rjti$4 + (br_if $__rjti$4 (i32.eqz (tee_local $4 (i32.load @@ -10921,7 +10921,7 @@ ) ) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) ) (if @@ -10955,7 +10955,7 @@ ) ) ) - (br_if $jumpthreading$inner$13 + (br_if $__rjti$13 (i32.ne (get_local $1) (i32.const -1) @@ -10968,7 +10968,7 @@ (set_local $1 (get_local $3) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) ) ) @@ -11061,7 +11061,7 @@ ) ) ) - (br_if $jumpthreading$inner$13 + (br_if $__rjti$13 (i32.eq (tee_local $2 (call $_sbrk @@ -11074,7 +11074,7 @@ (set_local $1 (get_local $3) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) ) ) @@ -11166,7 +11166,7 @@ (set_local $1 (get_local $2) ) - (br $jumpthreading$inner$13) + (br $__rjti$13) ) ) ) @@ -11211,7 +11211,7 @@ ) ) ) - (br_if $jumpthreading$inner$13 + (br_if $__rjti$13 (i32.gt_u (tee_local $3 (i32.sub @@ -11227,7 +11227,7 @@ ) ) ) - (br $jumpthreading$outer$13) + (br $__rjto$13) ) (i32.store (i32.const 608) @@ -11263,10 +11263,10 @@ (set_local $2 (i32.const 624) ) - (block $jumpthreading$outer$10 - (block $jumpthreading$inner$10 + (block $__rjto$10 + (block $__rjti$10 (loop $while-in45 - (br_if $jumpthreading$inner$10 + (br_if $__rjti$10 (i32.eq (get_local $1) (i32.add @@ -11296,7 +11296,7 @@ ) ) ) - (br $jumpthreading$outer$10) + (br $__rjto$10) ) (if (i32.eqz @@ -11424,8 +11424,8 @@ (set_local $2 (i32.const 624) ) - (block $jumpthreading$outer$11 - (block $jumpthreading$inner$11 + (block $__rjto$11 + (block $__rjti$11 (loop $while-in47 (if (i32.eq @@ -11438,7 +11438,7 @@ (set_local $5 (get_local $2) ) - (br $jumpthreading$inner$11) + (br $__rjti$11) ) ) (br_if $while-in47 @@ -11452,7 +11452,7 @@ (i32.const 624) ) ) - (br $jumpthreading$outer$11) + (br $__rjto$11) ) (if (i32.and @@ -12453,11 +12453,11 @@ (get_local $3) ) ) - (block $jumpthreading$outer$7 - (block $jumpthreading$inner$7 - (block $jumpthreading$inner$6 + (block $__rjto$7 + (block $__rjti$7 + (block $__rjti$6 (loop $while-in68 - (br_if $jumpthreading$inner$7 + (br_if $__rjti$7 (i32.eq (i32.and (i32.load offset=4 @@ -12474,7 +12474,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$6 + (br_if $__rjti$6 (i32.eqz (tee_local $1 (i32.load @@ -12534,7 +12534,7 @@ (br $do-once48) ) ) - (br $jumpthreading$outer$7) + (br $__rjto$7) ) (if (i32.and @@ -13132,11 +13132,11 @@ (get_local $2) ) ) - (block $jumpthreading$outer$9 - (block $jumpthreading$inner$9 - (block $jumpthreading$inner$8 + (block $__rjto$9 + (block $__rjti$9 + (block $__rjti$8 (loop $while-in74 - (br_if $jumpthreading$inner$9 + (br_if $__rjti$9 (i32.eq (i32.and (i32.load offset=4 @@ -13153,7 +13153,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$8 + (br_if $__rjti$8 (i32.eqz (tee_local $3 (i32.load @@ -13213,7 +13213,7 @@ (br $do-once40) ) ) - (br $jumpthreading$outer$9) + (br $__rjto$9) ) (if (i32.and @@ -15071,11 +15071,11 @@ (get_local $4) ) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in15 - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eq (i32.and (i32.load offset=4 @@ -15092,7 +15092,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eqz (tee_local $1 (i32.load @@ -15152,7 +15152,7 @@ (br $do-once12) ) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (if (i32.and diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index dcf4967c0..4363dc349 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -299,11 +299,11 @@ (set_local $1 (i32.const 0) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eq (i32.load8_u offset=687 (get_local $1) @@ -328,7 +328,7 @@ (set_local $0 (i32.const 775) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) ) (if @@ -337,13 +337,13 @@ (set_local $0 (i32.const 775) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) (set_local $0 (i32.const 775) ) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (loop $while-in1 (loop $while-in3 @@ -864,9 +864,9 @@ (get_local $2) ) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in (if (i32.load @@ -928,13 +928,13 @@ ) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eq (get_local $12) (get_local $3) ) ) - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.lt_s (get_local $3) (i32.const 0) @@ -1063,7 +1063,7 @@ (get_local $11) (get_local $1) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (i32.store offset=16 (get_local $0) @@ -1405,8 +1405,8 @@ (local $5 i32) (local $6 i32) (block $label$break$L5 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjti$0 + (br_if $__rjti$0 (tee_local $3 (i32.load (tee_local $4 @@ -1431,7 +1431,7 @@ (get_local $4) ) ) - (br $jumpthreading$inner$0) + (br $__rjti$0) ) ) (br $label$break$L5) @@ -1859,8 +1859,8 @@ ) ) (block $label$break$L8 - (block $jumpthreading$inner$2 - (block $jumpthreading$inner$1 + (block $__rjti$2 + (block $__rjti$1 (if (i32.and (tee_local $4 @@ -1908,7 +1908,7 @@ (set_local $0 (get_local $3) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) ) (br_if $while-in @@ -1938,7 +1938,7 @@ ) ) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) ) (block @@ -1960,7 +1960,7 @@ (set_local $0 (get_local $3) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) (set_local $0 (i32.const 0) @@ -1993,9 +1993,9 @@ (i32.const 16843009) ) ) - (block $jumpthreading$outer$0 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjto$0 + (block $__rjti$0 + (br_if $__rjti$0 (i32.le_u (get_local $0) (i32.const 3) @@ -2043,11 +2043,11 @@ (i32.const 3) ) ) - (br $jumpthreading$inner$0) + (br $__rjti$0) ) ) ) - (br $jumpthreading$outer$0) + (br $__rjto$0) ) (if (i32.eqz @@ -2130,9 +2130,9 @@ (local $5 i32) (local $6 i32) (tee_local $0 - (block $jumpthreading$outer$0 i32 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjto$0 i32 + (block $__rjti$0 + (br_if $__rjti$0 (i32.le_u (i32.load (tee_local $1 @@ -2168,12 +2168,12 @@ ) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.load (get_local $1) ) ) - (br $jumpthreading$outer$0 + (br $__rjto$0 (i32.const -1) ) ) @@ -2452,7 +2452,7 @@ (i32.const 0) ) (block $label$break$L343 - (block $jumpthreading$inner$9 + (block $__rjti$9 (loop $label$continue$L1 (block $label$break$L1 (if @@ -2483,7 +2483,7 @@ ) ) ) - (br_if $jumpthreading$inner$9 + (br_if $__rjti$9 (i32.eqz (i32.shr_s (i32.shl @@ -2502,7 +2502,7 @@ (get_local $5) ) (block $label$break$L12 - (block $jumpthreading$inner$1 + (block $__rjti$1 (loop $label$continue$L9 (block $label$break$L9 (block $switch-default @@ -2524,7 +2524,7 @@ (set_local $6 (get_local $10) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) (set_local $6 (get_local $10) @@ -2811,9 +2811,9 @@ ) (block (set_local $10 - (block $jumpthreading$outer$0 i32 - (block $jumpthreading$inner$0 - (br_if $jumpthreading$inner$0 + (block $__rjto$0 i32 + (block $__rjti$0 + (br_if $__rjti$0 (i32.ge_u (tee_local $11 (i32.add @@ -2831,7 +2831,7 @@ (i32.const 10) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.ne (i32.load8_s offset=2 (get_local $10) @@ -2871,7 +2871,7 @@ (get_local $6) ) ) - (br $jumpthreading$outer$0 + (br $__rjto$0 (i32.add (get_local $10) (i32.const 3) @@ -3377,8 +3377,8 @@ (i32.const -1) ) ) - (block $jumpthreading$outer$2 - (block $jumpthreading$inner$2 + (block $__rjto$2 + (block $__rjti$2 (if (i32.eq (i32.shr_s @@ -3398,7 +3398,7 @@ ) (br $label$break$L1) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) (block (if @@ -3439,7 +3439,7 @@ (get_local $8) (get_local $13) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) ) (if @@ -3460,7 +3460,7 @@ ) ) ) - (br $jumpthreading$outer$2) + (br $__rjto$2) ) (if (i32.eqz @@ -3492,13 +3492,13 @@ ) ) ) - (block $jumpthreading$outer$8 - (block $jumpthreading$inner$8 - (block $jumpthreading$inner$7 - (block $jumpthreading$inner$6 - (block $jumpthreading$inner$5 - (block $jumpthreading$inner$4 - (block $jumpthreading$inner$3 + (block $__rjto$8 + (block $__rjti$8 + (block $__rjti$7 + (block $__rjti$6 + (block $__rjti$5 + (block $__rjti$4 + (block $__rjti$3 (block $switch-default120 (block $switch-case42 (block $switch-case41 @@ -3714,12 +3714,12 @@ (set_local $18 (i32.const 120) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (set_local $7 (get_local $11) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (if (i32.and @@ -3828,7 +3828,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (block (set_local $5 @@ -3843,7 +3843,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) ) ) @@ -3889,7 +3889,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) ) (if @@ -3904,7 +3904,7 @@ (set_local $9 (i32.const 4092) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) (block (set_local $8 @@ -3922,7 +3922,7 @@ (get_local $9) ) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) ) ) @@ -3944,7 +3944,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) (set_local $5 (get_local $19) @@ -3973,7 +3973,7 @@ (set_local $5 (get_local $22) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $5 (call $_strerror @@ -3982,7 +3982,7 @@ ) ) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) (set_local $5 (select @@ -3995,7 +3995,7 @@ (get_local $5) ) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) (set_local $5 (get_local $19) @@ -4017,7 +4017,7 @@ (set_local $8 (i32.const -1) ) - (br $jumpthreading$inner$6) + (br $__rjti$6) ) (if (get_local $6) @@ -4025,7 +4025,7 @@ (set_local $8 (get_local $6) ) - (br $jumpthreading$inner$6) + (br $__rjti$6) ) (block (call $_pad @@ -4038,7 +4038,7 @@ (set_local $7 (i32.const 0) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) ) @@ -6530,7 +6530,7 @@ (set_local $5 (get_local $22) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $9 (i32.and @@ -6567,7 +6567,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (block (set_local $5 @@ -6651,7 +6651,7 @@ (set_local $9 (i32.const 4091) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (block (set_local $8 @@ -6666,12 +6666,12 @@ (i32.const 4091) ) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) ) ) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $5 (call $_fmt_u @@ -6683,7 +6683,7 @@ (set_local $7 (get_local $11) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) (set_local $18 (i32.eqz @@ -6728,7 +6728,7 @@ (get_local $18) ) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (set_local $5 (i32.const 0) @@ -6834,7 +6834,7 @@ (set_local $7 (get_local $5) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) (if @@ -6856,7 +6856,7 @@ (set_local $7 (get_local $5) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) (if @@ -6891,17 +6891,17 @@ (set_local $7 (get_local $5) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) (block (set_local $7 (i32.const 0) ) - (br $jumpthreading$inner$7) + (br $__rjti$7) ) ) - (br $jumpthreading$outer$8) + (br $__rjto$8) ) (call $_pad (get_local $0) @@ -9302,9 +9302,9 @@ (get_local $2) ) ) - (block $jumpthreading$outer$3 - (block $jumpthreading$inner$3 - (block $jumpthreading$inner$2 + (block $__rjto$3 + (block $__rjti$3 + (block $__rjti$2 (if (tee_local $0 (i32.load offset=480 @@ -9370,7 +9370,7 @@ (set_local $3 (get_local $0) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (block (set_local $3 @@ -9442,7 +9442,7 @@ (set_local $0 (get_local $1) ) - (br $jumpthreading$inner$2) + (br $__rjti$2) ) (block (set_local $6 @@ -9615,13 +9615,13 @@ (set_local $3 (get_local $4) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) (set_local $4 (get_local $0) ) ) - (br $jumpthreading$outer$3) + (br $__rjto$3) ) (loop $while-in16 (set_local $9 @@ -10393,11 +10393,11 @@ (get_local $2) ) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in28 - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eq (i32.and (i32.load offset=4 @@ -10414,7 +10414,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eqz (tee_local $1 (i32.load @@ -10474,7 +10474,7 @@ (br $do-once25) ) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (if (i32.and @@ -10839,8 +10839,8 @@ (i32.const 48) ) ) - (block $jumpthreading$outer$13 - (block $jumpthreading$inner$13 + (block $__rjto$13 + (block $__rjti$13 (if (i32.eqz (i32.and @@ -10852,9 +10852,9 @@ ) (block (block $label$break$L279 - (block $jumpthreading$inner$5 - (block $jumpthreading$inner$4 - (br_if $jumpthreading$inner$4 + (block $__rjti$5 + (block $__rjti$4 + (br_if $__rjti$4 (i32.eqz (tee_local $4 (i32.load @@ -10907,7 +10907,7 @@ ) ) ) - (br $jumpthreading$inner$4) + (br $__rjti$4) ) ) (if @@ -10941,7 +10941,7 @@ ) ) ) - (br_if $jumpthreading$inner$13 + (br_if $__rjti$13 (i32.ne (get_local $1) (i32.const -1) @@ -10954,7 +10954,7 @@ (set_local $1 (get_local $3) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) ) ) @@ -11047,7 +11047,7 @@ ) ) ) - (br_if $jumpthreading$inner$13 + (br_if $__rjti$13 (i32.eq (tee_local $2 (call $_sbrk @@ -11060,7 +11060,7 @@ (set_local $1 (get_local $3) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) ) ) @@ -11152,7 +11152,7 @@ (set_local $1 (get_local $2) ) - (br $jumpthreading$inner$13) + (br $__rjti$13) ) ) ) @@ -11197,7 +11197,7 @@ ) ) ) - (br_if $jumpthreading$inner$13 + (br_if $__rjti$13 (i32.gt_u (tee_local $3 (i32.sub @@ -11213,7 +11213,7 @@ ) ) ) - (br $jumpthreading$outer$13) + (br $__rjto$13) ) (i32.store (i32.const 608) @@ -11249,10 +11249,10 @@ (set_local $2 (i32.const 624) ) - (block $jumpthreading$outer$10 - (block $jumpthreading$inner$10 + (block $__rjto$10 + (block $__rjti$10 (loop $while-in45 - (br_if $jumpthreading$inner$10 + (br_if $__rjti$10 (i32.eq (get_local $1) (i32.add @@ -11282,7 +11282,7 @@ ) ) ) - (br $jumpthreading$outer$10) + (br $__rjto$10) ) (if (i32.eqz @@ -11410,8 +11410,8 @@ (set_local $2 (i32.const 624) ) - (block $jumpthreading$outer$11 - (block $jumpthreading$inner$11 + (block $__rjto$11 + (block $__rjti$11 (loop $while-in47 (if (i32.eq @@ -11424,7 +11424,7 @@ (set_local $5 (get_local $2) ) - (br $jumpthreading$inner$11) + (br $__rjti$11) ) ) (br_if $while-in47 @@ -11438,7 +11438,7 @@ (i32.const 624) ) ) - (br $jumpthreading$outer$11) + (br $__rjto$11) ) (if (i32.and @@ -12439,11 +12439,11 @@ (get_local $3) ) ) - (block $jumpthreading$outer$7 - (block $jumpthreading$inner$7 - (block $jumpthreading$inner$6 + (block $__rjto$7 + (block $__rjti$7 + (block $__rjti$6 (loop $while-in68 - (br_if $jumpthreading$inner$7 + (br_if $__rjti$7 (i32.eq (i32.and (i32.load offset=4 @@ -12460,7 +12460,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$6 + (br_if $__rjti$6 (i32.eqz (tee_local $1 (i32.load @@ -12520,7 +12520,7 @@ (br $do-once48) ) ) - (br $jumpthreading$outer$7) + (br $__rjto$7) ) (if (i32.and @@ -13118,11 +13118,11 @@ (get_local $2) ) ) - (block $jumpthreading$outer$9 - (block $jumpthreading$inner$9 - (block $jumpthreading$inner$8 + (block $__rjto$9 + (block $__rjti$9 + (block $__rjti$8 (loop $while-in74 - (br_if $jumpthreading$inner$9 + (br_if $__rjti$9 (i32.eq (i32.and (i32.load offset=4 @@ -13139,7 +13139,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$8 + (br_if $__rjti$8 (i32.eqz (tee_local $3 (i32.load @@ -13199,7 +13199,7 @@ (br $do-once40) ) ) - (br $jumpthreading$outer$9) + (br $__rjto$9) ) (if (i32.and @@ -15057,11 +15057,11 @@ (get_local $4) ) ) - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 - (block $jumpthreading$inner$0 + (block $__rjto$1 + (block $__rjti$1 + (block $__rjti$0 (loop $while-in15 - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eq (i32.and (i32.load offset=4 @@ -15078,7 +15078,7 @@ (i32.const 1) ) ) - (br_if $jumpthreading$inner$0 + (br_if $__rjti$0 (i32.eqz (tee_local $1 (i32.load @@ -15138,7 +15138,7 @@ (br $do-once12) ) ) - (br $jumpthreading$outer$1) + (br $__rjto$1) ) (if (i32.and diff --git a/test/unit.fromasm b/test/unit.fromasm index 1c8064892..4529af055 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -826,18 +826,18 @@ (get_local $1) ) (func $relooperJumpThreading (param $0 i32) (result i32) - (block $jumpthreading$outer$0 - (block $jumpthreading$inner$0 + (block $__rjto$0 + (block $__rjti$0 (if (get_local $0) (block (call $h (i32.const 0) ) - (br $jumpthreading$inner$0) + (br $__rjti$0) ) ) - (br $jumpthreading$outer$0) + (br $__rjto$0) ) (call $h (i32.const 1) @@ -846,7 +846,7 @@ (call $h (i32.const -1) ) - (block $jumpthreading$inner$1 + (block $__rjti$1 (loop $while-in (br_if $while-in (i32.eqz @@ -861,7 +861,7 @@ (call $h (i32.const 2) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) ) (call $h @@ -870,30 +870,30 @@ (call $h (i32.const -2) ) - (block $jumpthreading$outer$3 - (block $jumpthreading$inner$3 - (block $jumpthreading$inner$2 + (block $__rjto$3 + (block $__rjti$3 + (block $__rjti$2 (if (get_local $0) (block (call $h (i32.const 4) ) - (br_if $jumpthreading$inner$2 + (br_if $__rjti$2 (i32.eq (get_local $0) (i32.const 3) ) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) ) - (br $jumpthreading$outer$3) + (br $__rjto$3) ) (call $h (i32.const 5) ) - (br $jumpthreading$outer$3) + (br $__rjto$3) ) (call $h (i32.const 6) @@ -902,36 +902,36 @@ (call $h (i32.const -3) ) - (block $jumpthreading$outer$5 - (block $jumpthreading$inner$5 - (block $jumpthreading$inner$4 + (block $__rjto$5 + (block $__rjti$5 + (block $__rjti$4 (if (get_local $0) (block (call $h (i32.const 7) ) - (br_if $jumpthreading$inner$4 + (br_if $__rjti$4 (i32.eq (get_local $0) (i32.const 5) ) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) ) - (br $jumpthreading$outer$5) + (br $__rjto$5) ) (call $h (i32.const 8) ) - (br_if $jumpthreading$inner$5 + (br_if $__rjti$5 (i32.eq (get_local $0) (i32.const 6) ) ) - (br $jumpthreading$outer$5) + (br $__rjto$5) ) (call $h (i32.const 9) @@ -941,14 +941,14 @@ (i32.const -4) ) (block $label$break$L1 - (block $jumpthreading$inner$6 + (block $__rjti$6 (if (get_local $0) (block (call $h (i32.const 10) ) - (br $jumpthreading$inner$6) + (br $__rjti$6) ) ) (br $label$break$L1) @@ -961,21 +961,21 @@ (i32.const -5) ) (block $label$break$L10 - (block $jumpthreading$inner$8 - (block $jumpthreading$inner$7 + (block $__rjti$8 + (block $__rjti$7 (if (get_local $0) (block (call $h (i32.const 12) ) - (br_if $jumpthreading$inner$7 + (br_if $__rjti$7 (i32.eq (get_local $0) (i32.const 8) ) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) ) (br $label$break$L10) @@ -983,7 +983,7 @@ (call $h (i32.const 13) ) - (br_if $jumpthreading$inner$8 + (br_if $__rjti$8 (get_local $0) ) (br $label$break$L10) @@ -1004,16 +1004,16 @@ (local $3 i32) (local $4 i32) (loop $while-in - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 + (block $__rjto$1 + (block $__rjti$1 (if (get_local $0) - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eqz (get_local $1) ) ) - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eqz (get_local $2) ) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index 2f97cfe93..62c73c681 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -802,18 +802,18 @@ (get_local $1) ) (func $relooperJumpThreading (param $0 i32) (result i32) - (block $jumpthreading$outer$0 - (block $jumpthreading$inner$0 + (block $__rjto$0 + (block $__rjti$0 (if (get_local $0) (block (call $h (i32.const 0) ) - (br $jumpthreading$inner$0) + (br $__rjti$0) ) ) - (br $jumpthreading$outer$0) + (br $__rjto$0) ) (call $h (i32.const 1) @@ -822,7 +822,7 @@ (call $h (i32.const -1) ) - (block $jumpthreading$inner$1 + (block $__rjti$1 (loop $while-in (br_if $while-in (i32.eqz @@ -837,7 +837,7 @@ (call $h (i32.const 2) ) - (br $jumpthreading$inner$1) + (br $__rjti$1) ) ) (call $h @@ -846,30 +846,30 @@ (call $h (i32.const -2) ) - (block $jumpthreading$outer$3 - (block $jumpthreading$inner$3 - (block $jumpthreading$inner$2 + (block $__rjto$3 + (block $__rjti$3 + (block $__rjti$2 (if (get_local $0) (block (call $h (i32.const 4) ) - (br_if $jumpthreading$inner$2 + (br_if $__rjti$2 (i32.eq (get_local $0) (i32.const 3) ) ) - (br $jumpthreading$inner$3) + (br $__rjti$3) ) ) - (br $jumpthreading$outer$3) + (br $__rjto$3) ) (call $h (i32.const 5) ) - (br $jumpthreading$outer$3) + (br $__rjto$3) ) (call $h (i32.const 6) @@ -878,36 +878,36 @@ (call $h (i32.const -3) ) - (block $jumpthreading$outer$5 - (block $jumpthreading$inner$5 - (block $jumpthreading$inner$4 + (block $__rjto$5 + (block $__rjti$5 + (block $__rjti$4 (if (get_local $0) (block (call $h (i32.const 7) ) - (br_if $jumpthreading$inner$4 + (br_if $__rjti$4 (i32.eq (get_local $0) (i32.const 5) ) ) - (br $jumpthreading$inner$5) + (br $__rjti$5) ) ) - (br $jumpthreading$outer$5) + (br $__rjto$5) ) (call $h (i32.const 8) ) - (br_if $jumpthreading$inner$5 + (br_if $__rjti$5 (i32.eq (get_local $0) (i32.const 6) ) ) - (br $jumpthreading$outer$5) + (br $__rjto$5) ) (call $h (i32.const 9) @@ -917,14 +917,14 @@ (i32.const -4) ) (block $label$break$L1 - (block $jumpthreading$inner$6 + (block $__rjti$6 (if (get_local $0) (block (call $h (i32.const 10) ) - (br $jumpthreading$inner$6) + (br $__rjti$6) ) ) (br $label$break$L1) @@ -937,21 +937,21 @@ (i32.const -5) ) (block $label$break$L10 - (block $jumpthreading$inner$8 - (block $jumpthreading$inner$7 + (block $__rjti$8 + (block $__rjti$7 (if (get_local $0) (block (call $h (i32.const 12) ) - (br_if $jumpthreading$inner$7 + (br_if $__rjti$7 (i32.eq (get_local $0) (i32.const 8) ) ) - (br $jumpthreading$inner$8) + (br $__rjti$8) ) ) (br $label$break$L10) @@ -959,7 +959,7 @@ (call $h (i32.const 13) ) - (br_if $jumpthreading$inner$8 + (br_if $__rjti$8 (get_local $0) ) (br $label$break$L10) @@ -980,16 +980,16 @@ (local $3 i32) (local $4 i32) (loop $while-in - (block $jumpthreading$outer$1 - (block $jumpthreading$inner$1 + (block $__rjto$1 + (block $__rjti$1 (if (get_local $0) - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eqz (get_local $1) ) ) - (br_if $jumpthreading$inner$1 + (br_if $__rjti$1 (i32.eqz (get_local $2) ) |