diff options
32 files changed, 581 insertions, 577 deletions
diff --git a/src/wasm-binary.h b/src/wasm-binary.h index a1155f684..85e3ae166 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -44,7 +44,8 @@ enum { // accept enum WebLimitations { MaxDataSegments = 100 * 1000, - MaxFunctionBodySize = 128 * 1024 + MaxFunctionBodySize = 128 * 1024, + MaxFunctionLocals = 50 * 1000 }; template<typename T, typename MiniT> diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index 6af46cbd1..c60a3074a 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -1060,21 +1060,24 @@ void WasmBinaryBuilder::readFunctions() { endOfFunction = pos + size; auto type = functionTypes[i]; if (debug) std::cerr << "reading " << i << std::endl; - size_t nextVar = 0; - auto addVar = [&]() { - Name name = cashew::IString(("var$" + std::to_string(nextVar++)).c_str(), false); - return name; - }; - std::vector<NameType> params, vars; + std::vector<Type> params, vars; for (size_t j = 0; j < type->params.size(); j++) { - params.emplace_back(addVar(), type->params[j]); + params.emplace_back(type->params[j]); } size_t numLocalTypes = getU32LEB(); for (size_t t = 0; t < numLocalTypes; t++) { auto num = getU32LEB(); auto type = getConcreteType(); + if (num > WebLimitations::MaxFunctionLocals) { + // In general for Web limitations we try to just warn, but not actually + // enforce the limit ourselves (as we may be looking at wasm not intended + // to run on the Web). However, too many locals will simply cause us to + // OOM, so some arbitrary limit makes sense - and if so, why not use + // the arbitrary Web limit, for consistency. + throwError("too many locals, wasm VMs would not accept this binary"); + } while (num > 0) { - vars.emplace_back(addVar(), type); + vars.emplace_back(type); num--; } } diff --git a/test/atomics.wast.fromBinary b/test/atomics.wast.fromBinary index 80e178cc2..4d3534cd6 100644 --- a/test/atomics.wast.fromBinary +++ b/test/atomics.wast.fromBinary @@ -2,159 +2,159 @@ (type $0 (func)) (memory $0 (shared 23 256)) (func $atomic-loadstore (; 0 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.atomic.load8_u offset=4 - (get_local $var$0) + (get_local $0) ) ) (drop (i32.atomic.load16_u offset=4 - (get_local $var$0) + (get_local $0) ) ) (drop (i32.atomic.load offset=4 - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load8_u - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load16_u - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load32_u - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load - (get_local $var$0) + (get_local $0) ) ) (i32.atomic.store offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) (i32.atomic.store8 offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) (i32.atomic.store16 offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) (i64.atomic.store offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (i64.atomic.store8 offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (i64.atomic.store16 offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (i64.atomic.store32 offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) (func $atomic-rmw (; 1 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.atomic.rmw.add offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i32.atomic.rmw8_u.add offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i32.atomic.rmw16_u.and - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i64.atomic.rmw32_u.or - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) (drop (i32.atomic.rmw8_u.xchg - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) ) (func $atomic-cmpxchg (; 2 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.atomic.rmw.cmpxchg offset=4 - (get_local $var$0) - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) + (get_local $0) ) ) (drop (i32.atomic.rmw8_u.cmpxchg - (get_local $var$0) - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) + (get_local $0) ) ) (drop (i64.atomic.rmw.cmpxchg offset=4 - (get_local $var$0) - (get_local $var$1) - (get_local $var$1) + (get_local $0) + (get_local $1) + (get_local $1) ) ) (drop (i64.atomic.rmw32_u.cmpxchg - (get_local $var$0) - (get_local $var$1) - (get_local $var$1) + (get_local $0) + (get_local $1) + (get_local $1) ) ) ) (func $atomic-wait-wake (; 3 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.wait - (get_local $var$0) - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $0) + (get_local $1) ) ) (drop (wake - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i64.wait - (get_local $var$0) - (get_local $var$1) - (get_local $var$1) + (get_local $0) + (get_local $1) + (get_local $1) ) ) ) diff --git a/test/atomics.wast.fromBinary.noDebugInfo b/test/atomics.wast.fromBinary.noDebugInfo index 0bf843e6b..51d27e965 100644 --- a/test/atomics.wast.fromBinary.noDebugInfo +++ b/test/atomics.wast.fromBinary.noDebugInfo @@ -2,159 +2,159 @@ (type $0 (func)) (memory $0 (shared 23 256)) (func $0 (; 0 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.atomic.load8_u offset=4 - (get_local $var$0) + (get_local $0) ) ) (drop (i32.atomic.load16_u offset=4 - (get_local $var$0) + (get_local $0) ) ) (drop (i32.atomic.load offset=4 - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load8_u - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load16_u - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load32_u - (get_local $var$0) + (get_local $0) ) ) (drop (i64.atomic.load - (get_local $var$0) + (get_local $0) ) ) (i32.atomic.store offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) (i32.atomic.store8 offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) (i32.atomic.store16 offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) (i64.atomic.store offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (i64.atomic.store8 offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (i64.atomic.store16 offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (i64.atomic.store32 offset=4 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) (func $1 (; 1 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.atomic.rmw.add offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i32.atomic.rmw8_u.add offset=4 - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i32.atomic.rmw16_u.and - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i64.atomic.rmw32_u.or - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) (drop (i32.atomic.rmw8_u.xchg - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) ) (func $2 (; 2 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.atomic.rmw.cmpxchg offset=4 - (get_local $var$0) - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) + (get_local $0) ) ) (drop (i32.atomic.rmw8_u.cmpxchg - (get_local $var$0) - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) + (get_local $0) ) ) (drop (i64.atomic.rmw.cmpxchg offset=4 - (get_local $var$0) - (get_local $var$1) - (get_local $var$1) + (get_local $0) + (get_local $1) + (get_local $1) ) ) (drop (i64.atomic.rmw32_u.cmpxchg - (get_local $var$0) - (get_local $var$1) - (get_local $var$1) + (get_local $0) + (get_local $1) + (get_local $1) ) ) ) (func $3 (; 3 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.wait - (get_local $var$0) - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $0) + (get_local $1) ) ) (drop (wake - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (drop (i64.wait - (get_local $var$0) - (get_local $var$1) - (get_local $var$1) + (get_local $0) + (get_local $1) + (get_local $1) ) ) ) diff --git a/test/badvartype.wasm.fromBinary b/test/badvartype.wasm.fromBinary index c1441870c..e994ce2a9 100644 --- a/test/badvartype.wasm.fromBinary +++ b/test/badvartype.wasm.fromBinary @@ -21,7 +21,7 @@ (export "func_0" (func $0)) (export "func_2_invoker" (func $3)) (export "hangLimitInitializer" (func $7)) - (func $0 (; 0 ;) (type $0) (param $var$0 i32) (result f32) + (func $0 (; 0 ;) (type $0) (param $0 i32) (result f32) (block $label$1 (if (i32.eqz @@ -45,7 +45,7 @@ ) ) ) - (func $1 (; 1 ;) (type $2) (param $var$0 i64) (result f64) + (func $1 (; 1 ;) (type $2) (param $0 i64) (result f64) (block $label$1 (if (i32.eqz @@ -69,23 +69,23 @@ ) ) ) - (func $2 (; 2 ;) (type $3) (param $var$0 f32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i64) (param $var$4 i64) (param $var$5 i32) (param $var$6 i32) (result f64) - (local $var$7 i32) - (local $var$8 i32) - (local $var$9 i64) - (local $var$10 f32) - (local $var$11 f32) - (local $var$12 f32) - (local $var$13 f64) - (local $var$14 f64) - (local $var$15 f64) + (func $2 (; 2 ;) (type $3) (param $0 f32) (param $1 i32) (param $2 i32) (param $3 i64) (param $4 i64) (param $5 i32) (param $6 i32) (result f64) + (local $7 i32) + (local $8 i32) + (local $9 i64) + (local $10 f32) + (local $11 f32) + (local $12 f32) + (local $13 f64) + (local $14 f64) + (local $15 f64) (block $label$1 (if (i32.eqz (get_global $global$5) ) (return - (get_local $var$13) + (get_local $13) ) ) (set_global $global$5 @@ -126,25 +126,25 @@ ) (unreachable) ) - (func $4 (; 4 ;) (type $4) (param $var$0 f32) (param $var$1 f32) (result i64) - (local $var$2 i32) - (local $var$3 i32) - (local $var$4 i32) - (local $var$5 i32) - (local $var$6 i32) - (local $var$7 i64) - (local $var$8 i64) - (local $var$9 f32) - (local $var$10 f32) - (local $var$11 f32) - (local $var$12 f64) + (func $4 (; 4 ;) (type $4) (param $0 f32) (param $1 f32) (result i64) + (local $2 i32) + (local $3 i32) + (local $4 i32) + (local $5 i32) + (local $6 i32) + (local $7 i64) + (local $8 i64) + (local $9 f32) + (local $10 f32) + (local $11 f32) + (local $12 f64) (block $label$1 (if (i32.eqz (get_global $global$5) ) (return - (get_local $var$8) + (get_local $8) ) ) (set_global $global$5 @@ -182,8 +182,8 @@ ) (i64.const 3832563226) ) - (func $6 (; 6 ;) (type $6) (param $var$0 i32) (param $var$1 i32) - (local $var$2 i64) + (func $6 (; 6 ;) (type $6) (param $0 i32) (param $1 i32) + (local $2 i64) (block $label$1 (if (i32.eqz @@ -200,24 +200,24 @@ ) (block $label$3 (br_if $label$3 - (get_local $var$1) + (get_local $1) ) (if (i32.eqz - (get_local $var$1) + (get_local $1) ) (block $label$5 (nop) (br_if $label$3 - (tee_local $var$1 - (tee_local $var$1 - (tee_local $var$1 + (tee_local $1 + (tee_local $1 + (tee_local $1 (if (result i32) (i32.eqz - (get_local $var$1) + (get_local $1) ) (block $label$7 (result i32) - (set_local $var$2 + (set_local $2 (block $label$8 (result i64) (loop $label$9 (block $label$10 @@ -236,17 +236,17 @@ ) (block $label$12 (block $label$13 - (set_local $var$1 + (set_local $1 (br_if $label$7 - (get_local $var$0) + (get_local $0) (i32.eqz - (get_local $var$1) + (get_local $1) ) ) ) (if (i32.eqz - (get_local $var$1) + (get_local $1) ) (br_if $label$5 (i32.eqz @@ -271,7 +271,7 @@ (nop) (br_if $label$15 (i32.eqz - (tee_local $var$1 + (tee_local $1 (i32.const 32767) ) ) @@ -285,8 +285,8 @@ (block (drop (i64.add - (get_local $var$2) - (get_local $var$2) + (get_local $2) + (get_local $2) ) ) (nop) @@ -294,15 +294,15 @@ ) ) (br_if $label$9 - (get_local $var$1) + (get_local $1) ) (nop) ) ) - (get_local $var$2) + (get_local $2) ) ) - (get_local $var$1) + (get_local $1) ) (i32.const -7059178) ) @@ -320,23 +320,23 @@ (i32.const 10) ) ) - (func $8 (; 8 ;) (type $7) (param $var$0 f32) (result f32) + (func $8 (; 8 ;) (type $7) (param $0 f32) (result f32) (if (result f32) (f32.eq - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) - (get_local $var$0) + (get_local $0) (f32.const 0) ) ) - (func $9 (; 9 ;) (type $8) (param $var$0 f64) (result f64) + (func $9 (; 9 ;) (type $8) (param $0 f64) (result f64) (if (result f64) (f64.eq - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) - (get_local $var$0) + (get_local $0) (f64.const 0) ) ) diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt index 5edad3d88..2bec81e91 100644 --- a/test/binaryen.js/kitchen-sink.js.txt +++ b/test/binaryen.js/kitchen-sink.js.txt @@ -1067,10 +1067,10 @@ optimized: module loaded from binary form: (module (type $0 (func (param i32 i32) (result i32))) - (func $adder (; 0 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $adder (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (i32.add - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) ) diff --git a/test/break-to-return.wasm.fromBinary b/test/break-to-return.wasm.fromBinary index 72588bead..a7be1448a 100644 --- a/test/break-to-return.wasm.fromBinary +++ b/test/break-to-return.wasm.fromBinary @@ -2,12 +2,12 @@ (type $0 (func (param i32 i32) (result i32))) (memory $0 256 256) (export "add" (func $0)) - (func $0 (; 0 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $0 (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (block $label$0 (result i32) (br $label$0 (i32.add - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) ) diff --git a/test/crash/h01.wasm b/test/crash/h01.wasm Binary files differnew file mode 100644 index 000000000..8fd02a1f2 --- /dev/null +++ b/test/crash/h01.wasm diff --git a/test/debugInfo.fromasm.read-written b/test/debugInfo.fromasm.read-written index 63f356c1b..797d990e7 100644 --- a/test/debugInfo.fromasm.read-written +++ b/test/debugInfo.fromasm.read-written @@ -11,87 +11,87 @@ (export "fib" (func $fib)) (export "switch_reach" (func $switch_reach)) (export "nofile" (func $nofile)) - (func $add (; 0 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $add (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) ;;@ tests/other_file.cpp:314159:0 (i32.add - (get_local $var$1) - (get_local $var$1) + (get_local $1) + (get_local $1) ) ) - (func $ret (; 1 ;) (type $1) (param $var$0 i32) (result i32) + (func $ret (; 1 ;) (type $1) (param $0 i32) (result i32) ;;@ return.cpp:50:0 - (set_local $var$0 + (set_local $0 (i32.shl - (get_local $var$0) + (get_local $0) (i32.const 1) ) ) ;;@ return.cpp:100:0 (i32.add - (get_local $var$0) + (get_local $0) (i32.const 1) ) ) - (func $i32s-rem (; 2 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $i32s-rem (; 2 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (if (result i32) - (get_local $var$1) + (get_local $1) (i32.rem_s - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (i32.const 0) ) ) - (func $opts (; 3 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $opts (; 3 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) ;;@ even-opted.cpp:1:0 - (set_local $var$0 + (set_local $0 (i32.add - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) ;;@ even-opted.cpp:2:0 - (set_local $var$1 + (set_local $1 (i32.shr_s - (get_local $var$1) - (get_local $var$0) + (get_local $1) + (get_local $0) ) ) ;;@ even-opted.cpp:3:0 (i32.add (call $i32s-rem - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) - (get_local $var$1) + (get_local $1) ) ) - (func $fib (; 4 ;) (type $1) (param $var$0 i32) (result i32) - (local $var$1 i32) - (local $var$2 i32) - (local $var$3 i32) - (local $var$4 i32) + (func $fib (; 4 ;) (type $1) (param $0 i32) (result i32) + (local $1 i32) + (local $2 i32) + (local $3 i32) + (local $4 i32) ;;@ fib.c:8:0 - (set_local $var$4 + (set_local $4 (if (result i32) ;;@ fib.c:3:0 (i32.gt_s - (get_local $var$0) + (get_local $0) (i32.const 0) ) (block (result i32) - (set_local $var$3 + (set_local $3 (i32.const 1) ) (i32.const 0) ) (block (result i32) - (set_local $var$1 + (set_local $1 (i32.const 1) ) ;;@ fib.c:8:0 (return - (get_local $var$1) + (get_local $1) ) ) ) @@ -99,49 +99,49 @@ ;;@ fib.c:3:0 (loop $label$3 ;;@ fib.c:4:0 - (set_local $var$1 + (set_local $1 (i32.add - (get_local $var$3) - (get_local $var$4) + (get_local $3) + (get_local $4) ) ) ;;@ fib.c:3:0 - (set_local $var$2 + (set_local $2 (i32.add - (get_local $var$2) + (get_local $2) (i32.const 1) ) ) (if (i32.ne - (get_local $var$2) - (get_local $var$0) + (get_local $2) + (get_local $0) ) (block - (set_local $var$4 - (get_local $var$3) + (set_local $4 + (get_local $3) ) - (set_local $var$3 - (get_local $var$1) + (set_local $3 + (get_local $1) ) (br $label$3) ) ) ) ;;@ fib.c:8:0 - (get_local $var$1) + (get_local $1) ) - (func $switch_reach (; 5 ;) (type $1) (param $var$0 i32) (result i32) - (local $var$1 i32) - (set_local $var$1 + (func $switch_reach (; 5 ;) (type $1) (param $0 i32) (result i32) + (local $1 i32) + (set_local $1 (block $label$1 (result i32) (block $label$2 (br $label$1 (if (result i32) (i32.lt_s - (tee_local $var$1 + (tee_local $1 (i32.add - (get_local $var$0) + (get_local $0) (i32.const 52) ) ) @@ -151,7 +151,7 @@ (br_if $label$2 (i32.eqz (i32.sub - (get_local $var$1) + (get_local $1) (i32.const -1108210269) ) ) @@ -162,7 +162,7 @@ (br_if $label$2 (i32.eqz (i32.sub - (get_local $var$1) + (get_local $1) (i32.const 1369188723) ) ) @@ -173,17 +173,17 @@ ) ) (call $switch_reach - (get_local $var$0) + (get_local $0) ) ) ) (drop (call $switch_reach - (get_local $var$0) + (get_local $0) ) ) ;;@ /tmp/emscripten_test_binaryen2_28hnAe/src.c:59950:0 - (get_local $var$1) + (get_local $1) ) (func $nofile (; 6 ;) (type $2) ;;@ (unknown):1337:0 diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index e4c371211..7fa1b4ea7 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -1041,10 +1041,10 @@ optimized: module loaded from binary form: (module (type $0 (func (param i32 i32) (result i32))) - (func $adder (; 0 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $adder (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (i32.add - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) ) diff --git a/test/example/c-api-unused-mem.txt b/test/example/c-api-unused-mem.txt index 715a5e655..6e67735bd 100644 --- a/test/example/c-api-unused-mem.txt +++ b/test/example/c-api-unused-mem.txt @@ -55,11 +55,11 @@ (export "main" (func $main)) (export "rust_entry" (func $__wasm_start)) (func $main (; 0 ;) (type $0) - (local $var$0 i32) - (local $var$1 i32) - (local $var$2 i64) + (local $0 i32) + (local $1 i32) + (local $2 i64) (block $label$1 - (set_local $var$0 + (set_local $0 (i32.load (i32.const 0) ) @@ -80,7 +80,7 @@ (block $label$8 (i32.store (i32.const 0) - (get_local $var$0) + (get_local $0) ) (return) ) diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary index dec09980e..ecb9d7efd 100644 --- a/test/fib-dbg.wasm.fromBinary +++ b/test/fib-dbg.wasm.fromBinary @@ -48,16 +48,16 @@ (export "stackRestore" (func $stackRestore)) (export "_fib" (func $_fib)) (export "stackAlloc" (func $stackAlloc)) - (func $stackAlloc (; 0 ;) (type $1) (param $var$0 i32) (result i32) - (local $var$1 i32) + (func $stackAlloc (; 0 ;) (type $1) (param $0 i32) (result i32) + (local $1 i32) (block $label$1 - (set_local $var$1 + (set_local $1 (get_global $global$3) ) (set_global $global$3 (i32.add (get_global $global$3) - (get_local $var$0) + (get_local $0) ) ) (set_global $global$3 @@ -70,7 +70,7 @@ ) ) (return - (get_local $var$1) + (get_local $1) ) ) ) @@ -79,22 +79,22 @@ (get_global $global$3) ) ) - (func $stackRestore (; 2 ;) (type $3) (param $var$0 i32) + (func $stackRestore (; 2 ;) (type $3) (param $0 i32) (set_global $global$3 - (get_local $var$0) + (get_local $0) ) ) - (func $establishStackSpace (; 3 ;) (type $0) (param $var$0 i32) (param $var$1 i32) + (func $establishStackSpace (; 3 ;) (type $0) (param $0 i32) (param $1 i32) (block $label$1 (set_global $global$3 - (get_local $var$0) + (get_local $0) ) (set_global $global$4 - (get_local $var$1) + (get_local $1) ) ) ) - (func $setThrew (; 4 ;) (type $0) (param $var$0 i32) (param $var$1 i32) + (func $setThrew (; 4 ;) (type $0) (param $0 i32) (param $1 i32) (if (i32.eq (get_global $global$7) @@ -102,60 +102,60 @@ ) (block (set_global $global$7 - (get_local $var$0) + (get_local $0) ) (set_global $global$8 - (get_local $var$1) + (get_local $1) ) ) ) ) - (func $_fib (; 5 ;) (type $1) (param $var$0 i32) (result i32) - (local $var$1 i32) - (local $var$2 i32) - (local $var$3 i32) - (local $var$4 i32) - (local $var$5 i32) - (local $var$6 i32) - (local $var$7 i32) - (local $var$8 i32) - (local $var$9 i32) - (local $var$10 i32) - (local $var$11 i32) + (func $_fib (; 5 ;) (type $1) (param $0 i32) (result i32) + (local $1 i32) + (local $2 i32) + (local $3 i32) + (local $4 i32) + (local $5 i32) + (local $6 i32) + (local $7 i32) + (local $8 i32) + (local $9 i32) + (local $10 i32) + (local $11 i32) ;;@ fib.c:8:0 (block $label$1 - (set_local $var$11 + (set_local $11 (get_global $global$3) ) ;;@ fib.c:3:0 - (set_local $var$6 + (set_local $6 (i32.gt_s - (get_local $var$0) + (get_local $0) (i32.const 0) ) ) ;;@ fib.c:8:0 (if ;;@ fib.c:3:0 - (get_local $var$6) + (get_local $6) (block - (set_local $var$1 + (set_local $1 (i32.const 0) ) - (set_local $var$5 + (set_local $5 (i32.const 1) ) - (set_local $var$8 + (set_local $8 (i32.const 0) ) ) (block - (set_local $var$4 + (set_local $4 (i32.const 1) ) ;;@ fib.c:8:0 (return - (get_local $var$4) + (get_local $4) ) ) ) @@ -163,45 +163,45 @@ (loop $label$4 (block $label$5 ;;@ fib.c:4:0 - (set_local $var$3 + (set_local $3 (i32.add - (get_local $var$5) - (get_local $var$1) + (get_local $5) + (get_local $1) ) ) ;;@ fib.c:3:0 - (set_local $var$9 + (set_local $9 (i32.add - (get_local $var$8) + (get_local $8) (i32.const 1) ) ) - (set_local $var$7 + (set_local $7 (i32.eq - (get_local $var$9) - (get_local $var$0) + (get_local $9) + (get_local $0) ) ) (if - (get_local $var$7) + (get_local $7) (block - (set_local $var$4 - (get_local $var$3) + (set_local $4 + (get_local $3) ) (br $label$5) ) (block - (set_local $var$2 - (get_local $var$5) + (set_local $2 + (get_local $5) ) - (set_local $var$5 - (get_local $var$3) + (set_local $5 + (get_local $3) ) - (set_local $var$8 - (get_local $var$9) + (set_local $8 + (get_local $9) ) - (set_local $var$1 - (get_local $var$2) + (set_local $1 + (get_local $2) ) ) ) @@ -210,12 +210,12 @@ ) ;;@ fib.c:8:0 (return - (get_local $var$4) + (get_local $4) ) ) ) (func $runPostSets (; 6 ;) (type $4) - (local $var$0 i32) + (local $0 i32) (nop) ) ;; custom section "sourceMappingURL", size 35 diff --git a/test/grow_memory.wast.fromBinary b/test/grow_memory.wast.fromBinary index 9b8b8ee5e..13ce0d823 100644 --- a/test/grow_memory.wast.fromBinary +++ b/test/grow_memory.wast.fromBinary @@ -5,9 +5,9 @@ (export "memory" (memory $0)) (export "grow" (func $0)) (export "current" (func $1)) - (func $0 (; 0 ;) (type $0) (param $var$0 i32) (result i32) + (func $0 (; 0 ;) (type $0) (param $0 i32) (result i32) (grow_memory - (get_local $var$0) + (get_local $0) ) ) (func $1 (; 1 ;) (type $1) (result i32) diff --git a/test/grow_memory.wast.fromBinary.noDebugInfo b/test/grow_memory.wast.fromBinary.noDebugInfo index 9b8b8ee5e..13ce0d823 100644 --- a/test/grow_memory.wast.fromBinary.noDebugInfo +++ b/test/grow_memory.wast.fromBinary.noDebugInfo @@ -5,9 +5,9 @@ (export "memory" (memory $0)) (export "grow" (func $0)) (export "current" (func $1)) - (func $0 (; 0 ;) (type $0) (param $var$0 i32) (result i32) + (func $0 (; 0 ;) (type $0) (param $0 i32) (result i32) (grow_memory - (get_local $var$0) + (get_local $0) ) ) (func $1 (; 1 ;) (type $1) (result i32) diff --git a/test/hello_world.wast.fromBinary b/test/hello_world.wast.fromBinary index af6459839..ae0a331cd 100644 --- a/test/hello_world.wast.fromBinary +++ b/test/hello_world.wast.fromBinary @@ -2,10 +2,10 @@ (type $0 (func (param i32 i32) (result i32))) (memory $0 256 256) (export "add" (func $add)) - (func $add (; 0 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $add (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (i32.add - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) ) diff --git a/test/hello_world.wast.fromBinary.noDebugInfo b/test/hello_world.wast.fromBinary.noDebugInfo index bf7fff1e1..47077304c 100644 --- a/test/hello_world.wast.fromBinary.noDebugInfo +++ b/test/hello_world.wast.fromBinary.noDebugInfo @@ -2,10 +2,10 @@ (type $0 (func (param i32 i32) (result i32))) (memory $0 256 256) (export "add" (func $0)) - (func $0 (; 0 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $0 (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (i32.add - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) ) diff --git a/test/merge/dylib.wasm.combined b/test/merge/dylib.wasm.combined index 9a7d5ddd3..1b2dbf7cc 100644 --- a/test/merge/dylib.wasm.combined +++ b/test/merge/dylib.wasm.combined @@ -62,13 +62,13 @@ ) ) (func $_foo (; 4 ;) (type $1$0) (result i32) - (local $var$0 i32) + (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $var$0 + (set_local $0 (call $_main) ) - (get_local $var$0) + (get_local $0) ) ) ) diff --git a/test/merge/dylib.wasm.combined.finalized b/test/merge/dylib.wasm.combined.finalized index 10905193c..2015bb7f0 100644 --- a/test/merge/dylib.wasm.combined.finalized +++ b/test/merge/dylib.wasm.combined.finalized @@ -62,13 +62,13 @@ ) ) (func $_foo (; 4 ;) (type $1$0) (result i32) - (local $var$0 i32) + (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $var$0 + (set_local $0 (call $_main) ) - (get_local $var$0) + (get_local $0) ) ) ) diff --git a/test/merge/dylib.wasm.combined.finalized.opt b/test/merge/dylib.wasm.combined.finalized.opt index 228bbeb67..57d60021f 100644 --- a/test/merge/dylib.wasm.combined.finalized.opt +++ b/test/merge/dylib.wasm.combined.finalized.opt @@ -49,13 +49,13 @@ ) ) (func $_foo (; 4 ;) (type $2) (result i32) - (local $var$0 i32) + (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $var$0 + (set_local $0 (call $_main) ) - (get_local $var$0) + (get_local $0) ) ) ) diff --git a/test/merge/dylib.wasm.combined.opt b/test/merge/dylib.wasm.combined.opt index f049197d5..8d1ddfbb4 100644 --- a/test/merge/dylib.wasm.combined.opt +++ b/test/merge/dylib.wasm.combined.opt @@ -55,13 +55,13 @@ ) ) (func $_foo (; 4 ;) (type $2) (result i32) - (local $var$0 i32) + (local $0 i32) (block $label$1 (result i32) (block $label$2 (result i32) - (set_local $var$0 + (set_local $0 (call $_main) ) - (get_local $var$0) + (get_local $0) ) ) ) diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary index 272f10f7f..538bec07b 100644 --- a/test/min.wast.fromBinary +++ b/test/min.wast.fromBinary @@ -5,36 +5,36 @@ (type $3 (func (param i32 i32 i32) (result i32))) (memory $0 256 256) (export "floats" (func $floats)) - (func $floats (; 0 ;) (type $0) (param $var$0 f32) (result f32) - (local $var$1 f32) + (func $floats (; 0 ;) (type $0) (param $0 f32) (result f32) + (local $1 f32) (f32.add - (get_local $var$1) - (get_local $var$0) + (get_local $1) + (get_local $0) ) ) - (func $neg (; 1 ;) (type $1) (param $var$0 i32) (param $var$1 i32) (result f32) - (local $var$2 f32) - (tee_local $var$2 + (func $neg (; 1 ;) (type $1) (param $0 i32) (param $1 i32) (result f32) + (local $2 f32) + (tee_local $2 (f32.neg (block $label$1 (result f32) (i32.store - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (f32.load - (get_local $var$0) + (get_local $0) ) ) ) ) ) - (func $littleswitch (; 2 ;) (type $2) (param $var$0 i32) (result i32) + (func $littleswitch (; 2 ;) (type $2) (param $0 i32) (result i32) (block $label$1 (result i32) (block $label$2 (block $label$3 (br_table $label$3 $label$2 $label$3 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 1) ) ) @@ -48,8 +48,8 @@ ) ) ) - (func $f1 (; 3 ;) (type $3) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) - (get_local $var$2) + (func $f1 (; 3 ;) (type $3) (param $0 i32) (param $1 i32) (param $2 i32) (result i32) + (get_local $2) ) ) diff --git a/test/min.wast.fromBinary.noDebugInfo b/test/min.wast.fromBinary.noDebugInfo index c76976a51..f14f6f1d8 100644 --- a/test/min.wast.fromBinary.noDebugInfo +++ b/test/min.wast.fromBinary.noDebugInfo @@ -5,36 +5,36 @@ (type $3 (func (param i32 i32 i32) (result i32))) (memory $0 256 256) (export "floats" (func $0)) - (func $0 (; 0 ;) (type $0) (param $var$0 f32) (result f32) - (local $var$1 f32) + (func $0 (; 0 ;) (type $0) (param $0 f32) (result f32) + (local $1 f32) (f32.add - (get_local $var$1) - (get_local $var$0) + (get_local $1) + (get_local $0) ) ) - (func $1 (; 1 ;) (type $1) (param $var$0 i32) (param $var$1 i32) (result f32) - (local $var$2 f32) - (tee_local $var$2 + (func $1 (; 1 ;) (type $1) (param $0 i32) (param $1 i32) (result f32) + (local $2 f32) + (tee_local $2 (f32.neg (block $label$1 (result f32) (i32.store - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (f32.load - (get_local $var$0) + (get_local $0) ) ) ) ) ) - (func $2 (; 2 ;) (type $2) (param $var$0 i32) (result i32) + (func $2 (; 2 ;) (type $2) (param $0 i32) (result i32) (block $label$1 (result i32) (block $label$2 (block $label$3 (br_table $label$3 $label$2 $label$3 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 1) ) ) @@ -48,8 +48,8 @@ ) ) ) - (func $3 (; 3 ;) (type $3) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) - (get_local $var$2) + (func $3 (; 3 ;) (type $3) (param $0 i32) (param $1 i32) (param $2 i32) (result i32) + (get_local $2) ) ) diff --git a/test/passes/dce_vacuum.bin.txt b/test/passes/dce_vacuum.bin.txt index 45c69f17b..6282e694e 100644 --- a/test/passes/dce_vacuum.bin.txt +++ b/test/passes/dce_vacuum.bin.txt @@ -3,7 +3,7 @@ (type $1 (func (param f64 f64) (result f64))) (export "f32.compute_radix" (func $0)) (export "f64.compute_radix" (func $1)) - (func $0 (; 0 ;) (type $0) (param $var$0 f32) (param $var$1 f32) (result f32) + (func $0 (; 0 ;) (type $0) (param $0 f32) (param $1 f32) (result f32) (block $label$1 (loop $label$2 (br_if $label$2 @@ -11,15 +11,15 @@ (f32.add (f32.sub (f32.add - (tee_local $var$0 + (tee_local $0 (f32.add - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (f32.const 1) ) - (get_local $var$0) + (get_local $0) ) (f32.const -1) ) @@ -31,22 +31,22 @@ (drop (call $0 (f32.add - (get_local $var$0) - (tee_local $var$1 + (get_local $0) + (tee_local $1 (f32.add - (get_local $var$1) + (get_local $1) (f32.const 1) ) ) ) - (get_local $var$0) + (get_local $0) ) ) (unreachable) ) ) ) - (func $1 (; 1 ;) (type $1) (param $var$0 f64) (param $var$1 f64) (result f64) + (func $1 (; 1 ;) (type $1) (param $0 f64) (param $1 f64) (result f64) (block $label$1 (result f64) (loop $label$2 (br_if $label$2 @@ -54,15 +54,15 @@ (f64.add (f64.sub (f64.add - (tee_local $var$0 + (tee_local $0 (f64.add - (get_local $var$0) - (get_local $var$0) + (get_local $0) + (get_local $0) ) ) (f64.const 1) ) - (get_local $var$0) + (get_local $0) ) (f64.const -1) ) @@ -76,23 +76,23 @@ (f64.sub (f64.sub (f64.add - (get_local $var$0) - (tee_local $var$1 + (get_local $0) + (tee_local $1 (f64.add - (get_local $var$1) + (get_local $1) (f64.const 1) ) ) ) - (get_local $var$0) + (get_local $0) ) - (get_local $var$1) + (get_local $1) ) (f64.const 0) ) ) ) - (get_local $var$1) + (get_local $1) ) ) ) diff --git a/test/passes/flatten.bin.txt b/test/passes/flatten.bin.txt index bc406e1ae..a3386fd7c 100644 --- a/test/passes/flatten.bin.txt +++ b/test/passes/flatten.bin.txt @@ -20,86 +20,86 @@ (export "type-mixed" (func $8)) (export "read" (func $9)) (func $0 (; 0 ;) (type $0) (result i32) - (local $var$0 i32) + (local $0 i32) (local $1 i32) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) (func $1 (; 1 ;) (type $1) (result i64) - (local $var$0 i64) + (local $0 i64) (local $1 i64) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) (func $2 (; 2 ;) (type $2) (result f32) - (local $var$0 f32) + (local $0 f32) (local $1 f32) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) (func $3 (; 3 ;) (type $3) (result f64) - (local $var$0 f64) + (local $0 f64) (local $1 f64) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) - (func $4 (; 4 ;) (type $4) (param $var$0 i32) (result i32) + (func $4 (; 4 ;) (type $4) (param $0 i32) (result i32) (local $1 i32) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) - (func $5 (; 5 ;) (type $5) (param $var$0 i64) (result i64) + (func $5 (; 5 ;) (type $5) (param $0 i64) (result i64) (local $1 i64) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) - (func $6 (; 6 ;) (type $6) (param $var$0 f32) (result f32) + (func $6 (; 6 ;) (type $6) (param $0 f32) (result f32) (local $1 f32) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) - (func $7 (; 7 ;) (type $7) (param $var$0 f64) (result f64) + (func $7 (; 7 ;) (type $7) (param $0 f64) (result f64) (local $1 f64) (set_local $1 - (get_local $var$0) + (get_local $0) ) (return (get_local $1) ) ) - (func $8 (; 8 ;) (type $8) (param $var$0 i64) (param $var$1 f32) (param $var$2 f64) (param $var$3 i32) (param $var$4 i32) - (local $var$5 i64) - (local $var$6 i64) - (local $var$7 f32) - (local $var$8 f64) + (func $8 (; 8 ;) (type $8) (param $0 i64) (param $1 f32) (param $2 f64) (param $3 i32) (param $4 i32) + (local $5 i64) + (local $6 i64) + (local $7 f32) + (local $8 f64) (block $label$1 (nop) (unreachable) @@ -107,11 +107,11 @@ ) (unreachable) ) - (func $9 (; 9 ;) (type $9) (param $var$0 i64) (param $var$1 f32) (param $var$2 f64) (param $var$3 i32) (param $var$4 i32) (result f64) - (local $var$5 i64) - (local $var$6 i64) - (local $var$7 f32) - (local $var$8 f64) + (func $9 (; 9 ;) (type $9) (param $0 i64) (param $1 f32) (param $2 f64) (param $3 i32) (param $4 i32) (result f64) + (local $5 i64) + (local $6 i64) + (local $7 f32) + (local $8 f64) (local $9 i64) (local $10 f64) (local $11 f32) @@ -139,20 +139,20 @@ (local $33 f64) (local $34 f64) (block $label$1 - (set_local $var$7 + (set_local $7 (f32.const 5.5) ) (nop) - (set_local $var$5 + (set_local $5 (i64.const 6) ) (nop) - (set_local $var$8 + (set_local $8 (f64.const 8) ) (nop) (set_local $9 - (get_local $var$0) + (get_local $0) ) (set_local $10 (f64.convert_u/i64 @@ -160,7 +160,7 @@ ) ) (set_local $11 - (get_local $var$1) + (get_local $1) ) (set_local $12 (f64.promote/f32 @@ -168,10 +168,10 @@ ) ) (set_local $13 - (get_local $var$2) + (get_local $2) ) (set_local $14 - (get_local $var$3) + (get_local $3) ) (set_local $15 (f64.convert_u/i32 @@ -179,7 +179,7 @@ ) ) (set_local $16 - (get_local $var$4) + (get_local $4) ) (set_local $17 (f64.convert_s/i32 @@ -187,7 +187,7 @@ ) ) (set_local $18 - (get_local $var$7) + (get_local $7) ) (set_local $19 (f64.promote/f32 @@ -195,7 +195,7 @@ ) ) (set_local $20 - (get_local $var$5) + (get_local $5) ) (set_local $21 (f64.convert_u/i64 @@ -203,7 +203,7 @@ ) ) (set_local $22 - (get_local $var$6) + (get_local $6) ) (set_local $23 (f64.convert_u/i64 @@ -211,7 +211,7 @@ ) ) (set_local $24 - (get_local $var$8) + (get_local $8) ) (set_local $25 (f64.add diff --git a/test/polymorphic_stack.wast.fromBinary b/test/polymorphic_stack.wast.fromBinary index 9d4ee909c..3a6fcec9a 100644 --- a/test/polymorphic_stack.wast.fromBinary +++ b/test/polymorphic_stack.wast.fromBinary @@ -9,15 +9,15 @@ (unreachable) ) ) - (func $call-and-unary (; 1 ;) (type $0) (param $var$0 i32) (result i32) + (func $call-and-unary (; 1 ;) (type $0) (param $0 i32) (result i32) (unreachable) ) - (func $tee (; 2 ;) (type $2) (param $var$0 i32) - (local $var$1 f32) + (func $tee (; 2 ;) (type $2) (param $0 i32) + (local $1 f32) (unreachable) ) (func $tee2 (; 3 ;) (type $3) - (local $var$0 f32) + (local $0 f32) (if (i32.const 259) (unreachable) @@ -37,9 +37,9 @@ (unreachable) ) ) - (func $unreachable-in-block-but-code-before (; 6 ;) (type $0) (param $var$0 i32) (result i32) + (func $unreachable-in-block-but-code-before (; 6 ;) (type $0) (param $0 i32) (result i32) (if - (get_local $var$0) + (get_local $0) (return (i32.const 127) ) diff --git a/test/polymorphic_stack.wast.fromBinary.noDebugInfo b/test/polymorphic_stack.wast.fromBinary.noDebugInfo index 6a7a97774..0b26011b8 100644 --- a/test/polymorphic_stack.wast.fromBinary.noDebugInfo +++ b/test/polymorphic_stack.wast.fromBinary.noDebugInfo @@ -9,15 +9,15 @@ (unreachable) ) ) - (func $1 (; 1 ;) (type $0) (param $var$0 i32) (result i32) + (func $1 (; 1 ;) (type $0) (param $0 i32) (result i32) (unreachable) ) - (func $2 (; 2 ;) (type $2) (param $var$0 i32) - (local $var$1 f32) + (func $2 (; 2 ;) (type $2) (param $0 i32) + (local $1 f32) (unreachable) ) (func $3 (; 3 ;) (type $3) - (local $var$0 f32) + (local $0 f32) (if (i32.const 259) (unreachable) @@ -37,9 +37,9 @@ (unreachable) ) ) - (func $6 (; 6 ;) (type $0) (param $var$0 i32) (result i32) + (func $6 (; 6 ;) (type $0) (param $0 i32) (result i32) (if - (get_local $var$0) + (get_local $0) (return (i32.const 127) ) diff --git a/test/reduce/destructive.wast.txt b/test/reduce/destructive.wast.txt index 05a3d3118..8721c051f 100644 --- a/test/reduce/destructive.wast.txt +++ b/test/reduce/destructive.wast.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32) (result i32))) (export "x" (func $0)) - (func $0 (; 0 ;) (type $0) (param $var$0 i32) (result i32) + (func $0 (; 0 ;) (type $0) (param $0 i32) (result i32) (i32.const 100) ) ) diff --git a/test/signext.wast.fromBinary b/test/signext.wast.fromBinary index 9af6f6ca1..3a7b3017a 100644 --- a/test/signext.wast.fromBinary +++ b/test/signext.wast.fromBinary @@ -1,31 +1,31 @@ (module (type $0 (func)) (func $signext (; 0 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.extend8_s - (get_local $var$0) + (get_local $0) ) ) (drop (i32.extend16_s - (get_local $var$0) + (get_local $0) ) ) (drop (i64.extend8_s - (get_local $var$1) + (get_local $1) ) ) (drop (i64.extend16_s - (get_local $var$1) + (get_local $1) ) ) (drop (i64.extend32_s - (get_local $var$1) + (get_local $1) ) ) ) diff --git a/test/signext.wast.fromBinary.noDebugInfo b/test/signext.wast.fromBinary.noDebugInfo index 3c46c6eeb..46b36e4a7 100644 --- a/test/signext.wast.fromBinary.noDebugInfo +++ b/test/signext.wast.fromBinary.noDebugInfo @@ -1,31 +1,31 @@ (module (type $0 (func)) (func $0 (; 0 ;) (type $0) - (local $var$0 i32) - (local $var$1 i64) + (local $0 i32) + (local $1 i64) (drop (i32.extend8_s - (get_local $var$0) + (get_local $0) ) ) (drop (i32.extend16_s - (get_local $var$0) + (get_local $0) ) ) (drop (i64.extend8_s - (get_local $var$1) + (get_local $1) ) ) (drop (i64.extend16_s - (get_local $var$1) + (get_local $1) ) ) (drop (i64.extend32_s - (get_local $var$1) + (get_local $1) ) ) ) diff --git a/test/stacky.wasm.fromBinary b/test/stacky.wasm.fromBinary index 3f2bded48..d76338638 100644 --- a/test/stacky.wasm.fromBinary +++ b/test/stacky.wasm.fromBinary @@ -2,19 +2,19 @@ (type $0 (func (param i32 i32) (result i32))) (memory $0 256 256) (export "add" (func $0)) - (func $0 (; 0 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $0 (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (local $2 i32) (i32.add (block (result i32) (set_local $2 - (get_local $var$0) + (get_local $0) ) - (set_local $var$0 + (set_local $0 (i32.const 100) ) (get_local $2) ) - (get_local $var$1) + (get_local $1) ) ) ) diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary index fc06a7c11..cbd81cc81 100644 --- a/test/unit.wast.fromBinary +++ b/test/unit.wast.fromBinary @@ -18,27 +18,27 @@ (data (i32.const 1026) "\14\00") (export "big_negative" (func $big_negative)) (func $big_negative (; 3 ;) (type $1) - (local $var$0 f64) - (set_local $var$0 + (local $0 f64) + (set_local $0 (f64.const -2147483648) ) - (set_local $var$0 + (set_local $0 (f64.const -2147483648) ) - (set_local $var$0 + (set_local $0 (f64.const -21474836480) ) - (set_local $var$0 + (set_local $0 (f64.const 0.039625) ) - (set_local $var$0 + (set_local $0 (f64.const -0.039625) ) ) (func $importedDoubles (; 4 ;) (type $4) (result f64) - (local $var$0 f64) + (local $0 f64) (block $label$1 (result f64) - (set_local $var$0 + (set_local $0 (f64.add (f64.add (f64.add @@ -87,14 +87,14 @@ (f64.const 1.2) ) ) - (func $doubleCompares (; 5 ;) (type $3) (param $var$0 f64) (param $var$1 f64) (result f64) - (local $var$2 i32) - (local $var$3 f64) - (local $var$4 f64) + (func $doubleCompares (; 5 ;) (type $3) (param $0 f64) (param $1 f64) (result f64) + (local $2 i32) + (local $3 f64) + (local $4 f64) (block $label$1 (result f64) (if (f64.gt - (get_local $var$0) + (get_local $0) (f64.const 0) ) (br $label$1 @@ -103,7 +103,7 @@ ) (if (f64.gt - (get_local $var$4) + (get_local $4) (f64.const 0) ) (br $label$1 @@ -112,7 +112,7 @@ ) (if (i32.gt_s - (get_local $var$2) + (get_local $2) (i32.const 0) ) (br $label$1 @@ -121,20 +121,20 @@ ) (if (f64.lt - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (br $label$1 - (get_local $var$0) + (get_local $0) ) ) - (get_local $var$1) + (get_local $1) ) ) (func $intOps (; 6 ;) (type $5) (result i32) - (local $var$0 i32) + (local $0 i32) (i32.eq - (get_local $var$0) + (get_local $0) (i32.const 0) ) ) @@ -150,30 +150,30 @@ ) ) (func $conversions (; 8 ;) (type $1) - (local $var$0 i32) - (local $var$1 f64) - (set_local $var$0 + (local $0 i32) + (local $1 f64) + (set_local $0 (call $f64-to-int - (get_local $var$1) + (get_local $1) ) ) - (set_local $var$1 + (set_local $1 (f64.convert_s/i32 - (get_local $var$0) + (get_local $0) ) ) - (set_local $var$1 + (set_local $1 (f64.convert_u/i32 (i32.shr_u - (get_local $var$0) + (get_local $0) (i32.const 0) ) ) ) ) (func $seq (; 9 ;) (type $1) - (local $var$0 f64) - (set_local $var$0 + (local $0 f64) + (set_local $0 (f64.sub (block $label$1 (result f64) (drop @@ -190,7 +190,7 @@ ) ) ) - (func $switcher (; 10 ;) (type $6) (param $var$0 i32) (result i32) + (func $switcher (; 10 ;) (type $6) (param $0 i32) (result i32) (block $label$1 (result i32) (block $label$2 (block $label$3 @@ -198,7 +198,7 @@ (block $label$5 (br_table $label$5 $label$4 $label$3 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 1) ) ) @@ -219,7 +219,7 @@ (block $label$9 (br_table $label$8 $label$7 $label$7 $label$7 $label$7 $label$7 $label$7 $label$9 $label$7 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 5) ) ) @@ -242,7 +242,7 @@ (block $label$15 (br_table $label$12 $label$11 $label$11 $label$13 $label$11 $label$11 $label$11 $label$11 $label$14 $label$11 $label$15 $label$11 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 2) ) ) @@ -280,8 +280,8 @@ ) ) (func $big_uint_div_u (; 13 ;) (type $5) (result i32) - (local $var$0 i32) - (set_local $var$0 + (local $0 i32) + (set_local $0 (i32.and (i32.div_u (i32.const -1) @@ -290,18 +290,18 @@ (i32.const -1) ) ) - (get_local $var$0) + (get_local $0) ) - (func $fr (; 14 ;) (type $0) (param $var$0 f32) - (local $var$1 f32) - (local $var$2 f64) + (func $fr (; 14 ;) (type $0) (param $0 f32) + (local $1 f32) + (local $2 f64) (drop (f32.demote/f64 - (get_local $var$2) + (get_local $2) ) ) (drop - (get_local $var$1) + (get_local $1) ) (drop (f32.const 5) @@ -320,48 +320,48 @@ (f64.const -0) ) (func $abs (; 16 ;) (type $1) - (local $var$0 i32) - (local $var$1 i32) - (local $var$2 f32) - (local $var$3 f64) - (set_local $var$0 + (local $0 i32) + (local $1 i32) + (local $2 f32) + (local $3 f64) + (set_local $0 (block $label$1 (result i32) - (set_local $var$1 + (set_local $1 (i32.const 0) ) (select (i32.sub (i32.const 0) - (get_local $var$1) + (get_local $1) ) - (get_local $var$1) + (get_local $1) (i32.lt_s - (get_local $var$1) + (get_local $1) (i32.const 0) ) ) ) ) - (set_local $var$3 + (set_local $3 (f64.abs (f64.const 0) ) ) - (set_local $var$2 + (set_local $2 (f32.abs (f32.const 0) ) ) ) (func $neg (; 17 ;) (type $1) - (local $var$0 f32) - (set_local $var$0 + (local $0 f32) + (set_local $0 (f32.neg - (get_local $var$0) + (get_local $0) ) ) (call_indirect (type $0) - (get_local $var$0) + (get_local $0) (i32.add (i32.and (i32.const 1) @@ -371,9 +371,9 @@ ) ) ) - (func $cneg (; 18 ;) (type $0) (param $var$0 f32) + (func $cneg (; 18 ;) (type $0) (param $0 f32) (call_indirect (type $0) - (get_local $var$0) + (get_local $0) (i32.add (i32.and (i32.const 1) @@ -384,11 +384,11 @@ ) ) (func $___syscall_ret (; 19 ;) (type $1) - (local $var$0 i32) + (local $0 i32) (drop (i32.gt_u (i32.shr_u - (get_local $var$0) + (get_local $0) (i32.const 0) ) (i32.const -4096) @@ -410,21 +410,21 @@ ) (i32.const 0) ) - (func $loop-roundtrip (; 23 ;) (type $7) (param $var$0 f64) (result f64) + (func $loop-roundtrip (; 23 ;) (type $7) (param $0 f64) (result f64) (loop $label$1 (result f64) (drop - (get_local $var$0) + (get_local $0) ) - (get_local $var$0) + (get_local $0) ) ) (func $big-i64 (; 24 ;) (type $8) (result i64) (i64.const -9218868437227405313) ) - (func $i64-store32 (; 25 ;) (type $9) (param $var$0 i32) (param $var$1 i64) + (func $i64-store32 (; 25 ;) (type $9) (param $0 i32) (param $1 i64) (i64.store32 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) (func $return-unreachable (; 26 ;) (type $5) (result i32) diff --git a/test/unit.wast.fromBinary.noDebugInfo b/test/unit.wast.fromBinary.noDebugInfo index 5402df154..c9f71dc1c 100644 --- a/test/unit.wast.fromBinary.noDebugInfo +++ b/test/unit.wast.fromBinary.noDebugInfo @@ -18,27 +18,27 @@ (data (i32.const 1026) "\14\00") (export "big_negative" (func $0)) (func $0 (; 3 ;) (type $1) - (local $var$0 f64) - (set_local $var$0 + (local $0 f64) + (set_local $0 (f64.const -2147483648) ) - (set_local $var$0 + (set_local $0 (f64.const -2147483648) ) - (set_local $var$0 + (set_local $0 (f64.const -21474836480) ) - (set_local $var$0 + (set_local $0 (f64.const 0.039625) ) - (set_local $var$0 + (set_local $0 (f64.const -0.039625) ) ) (func $1 (; 4 ;) (type $4) (result f64) - (local $var$0 f64) + (local $0 f64) (block $label$1 (result f64) - (set_local $var$0 + (set_local $0 (f64.add (f64.add (f64.add @@ -87,14 +87,14 @@ (f64.const 1.2) ) ) - (func $2 (; 5 ;) (type $3) (param $var$0 f64) (param $var$1 f64) (result f64) - (local $var$2 i32) - (local $var$3 f64) - (local $var$4 f64) + (func $2 (; 5 ;) (type $3) (param $0 f64) (param $1 f64) (result f64) + (local $2 i32) + (local $3 f64) + (local $4 f64) (block $label$1 (result f64) (if (f64.gt - (get_local $var$0) + (get_local $0) (f64.const 0) ) (br $label$1 @@ -103,7 +103,7 @@ ) (if (f64.gt - (get_local $var$4) + (get_local $4) (f64.const 0) ) (br $label$1 @@ -112,7 +112,7 @@ ) (if (i32.gt_s - (get_local $var$2) + (get_local $2) (i32.const 0) ) (br $label$1 @@ -121,20 +121,20 @@ ) (if (f64.lt - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) (br $label$1 - (get_local $var$0) + (get_local $0) ) ) - (get_local $var$1) + (get_local $1) ) ) (func $3 (; 6 ;) (type $5) (result i32) - (local $var$0 i32) + (local $0 i32) (i32.eq - (get_local $var$0) + (get_local $0) (i32.const 0) ) ) @@ -150,30 +150,30 @@ ) ) (func $5 (; 8 ;) (type $1) - (local $var$0 i32) - (local $var$1 f64) - (set_local $var$0 + (local $0 i32) + (local $1 f64) + (set_local $0 (call $fimport$1 - (get_local $var$1) + (get_local $1) ) ) - (set_local $var$1 + (set_local $1 (f64.convert_s/i32 - (get_local $var$0) + (get_local $0) ) ) - (set_local $var$1 + (set_local $1 (f64.convert_u/i32 (i32.shr_u - (get_local $var$0) + (get_local $0) (i32.const 0) ) ) ) ) (func $6 (; 9 ;) (type $1) - (local $var$0 f64) - (set_local $var$0 + (local $0 f64) + (set_local $0 (f64.sub (block $label$1 (result f64) (drop @@ -190,7 +190,7 @@ ) ) ) - (func $7 (; 10 ;) (type $6) (param $var$0 i32) (result i32) + (func $7 (; 10 ;) (type $6) (param $0 i32) (result i32) (block $label$1 (result i32) (block $label$2 (block $label$3 @@ -198,7 +198,7 @@ (block $label$5 (br_table $label$5 $label$4 $label$3 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 1) ) ) @@ -219,7 +219,7 @@ (block $label$9 (br_table $label$8 $label$7 $label$7 $label$7 $label$7 $label$7 $label$7 $label$9 $label$7 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 5) ) ) @@ -242,7 +242,7 @@ (block $label$15 (br_table $label$12 $label$11 $label$11 $label$13 $label$11 $label$11 $label$11 $label$11 $label$14 $label$11 $label$15 $label$11 (i32.sub - (get_local $var$0) + (get_local $0) (i32.const 2) ) ) @@ -280,8 +280,8 @@ ) ) (func $10 (; 13 ;) (type $5) (result i32) - (local $var$0 i32) - (set_local $var$0 + (local $0 i32) + (set_local $0 (i32.and (i32.div_u (i32.const -1) @@ -290,18 +290,18 @@ (i32.const -1) ) ) - (get_local $var$0) + (get_local $0) ) - (func $11 (; 14 ;) (type $0) (param $var$0 f32) - (local $var$1 f32) - (local $var$2 f64) + (func $11 (; 14 ;) (type $0) (param $0 f32) + (local $1 f32) + (local $2 f64) (drop (f32.demote/f64 - (get_local $var$2) + (get_local $2) ) ) (drop - (get_local $var$1) + (get_local $1) ) (drop (f32.const 5) @@ -320,48 +320,48 @@ (f64.const -0) ) (func $13 (; 16 ;) (type $1) - (local $var$0 i32) - (local $var$1 i32) - (local $var$2 f32) - (local $var$3 f64) - (set_local $var$0 + (local $0 i32) + (local $1 i32) + (local $2 f32) + (local $3 f64) + (set_local $0 (block $label$1 (result i32) - (set_local $var$1 + (set_local $1 (i32.const 0) ) (select (i32.sub (i32.const 0) - (get_local $var$1) + (get_local $1) ) - (get_local $var$1) + (get_local $1) (i32.lt_s - (get_local $var$1) + (get_local $1) (i32.const 0) ) ) ) ) - (set_local $var$3 + (set_local $3 (f64.abs (f64.const 0) ) ) - (set_local $var$2 + (set_local $2 (f32.abs (f32.const 0) ) ) ) (func $14 (; 17 ;) (type $1) - (local $var$0 f32) - (set_local $var$0 + (local $0 f32) + (set_local $0 (f32.neg - (get_local $var$0) + (get_local $0) ) ) (call_indirect (type $0) - (get_local $var$0) + (get_local $0) (i32.add (i32.and (i32.const 1) @@ -371,9 +371,9 @@ ) ) ) - (func $15 (; 18 ;) (type $0) (param $var$0 f32) + (func $15 (; 18 ;) (type $0) (param $0 f32) (call_indirect (type $0) - (get_local $var$0) + (get_local $0) (i32.add (i32.and (i32.const 1) @@ -384,11 +384,11 @@ ) ) (func $16 (; 19 ;) (type $1) - (local $var$0 i32) + (local $0 i32) (drop (i32.gt_u (i32.shr_u - (get_local $var$0) + (get_local $0) (i32.const 0) ) (i32.const -4096) @@ -410,21 +410,21 @@ ) (i32.const 0) ) - (func $20 (; 23 ;) (type $7) (param $var$0 f64) (result f64) + (func $20 (; 23 ;) (type $7) (param $0 f64) (result f64) (loop $label$1 (result f64) (drop - (get_local $var$0) + (get_local $0) ) - (get_local $var$0) + (get_local $0) ) ) (func $21 (; 24 ;) (type $8) (result i64) (i64.const -9218868437227405313) ) - (func $22 (; 25 ;) (type $9) (param $var$0 i32) (param $var$1 i64) + (func $22 (; 25 ;) (type $9) (param $0 i32) (param $1 i64) (i64.store32 - (get_local $var$0) - (get_local $var$1) + (get_local $0) + (get_local $1) ) ) (func $23 (; 26 ;) (type $5) (result i32) |