From b573ea4f8d89225bc538041dd28131c2fc7b2e42 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Wed, 21 Jun 2017 17:49:34 -0700 Subject: [PATCH 01/11] Add IR and wast syntax for shareable memories --- src/passes/Print.cpp | 3 + src/wasm.h | 3 +- src/wasm/wasm-s-parser.cpp | 14 +- test/break-to-return.wasm.fromBinary | 2 +- test/debugInfo.fromasm | 2 +- test/debugInfo.fromasm.clamp | 2 +- test/debugInfo.fromasm.clamp.no-opts | 2 +- test/debugInfo.fromasm.imprecise | 2 +- test/debugInfo.fromasm.imprecise.no-opts | 2 +- test/debugInfo.fromasm.no-opts | 2 +- test/dot_s/alias.wast | 2 +- test/dot_s/alternate-lcomm.wast | 2 +- test/dot_s/asm_const.wast | 2 +- test/dot_s/basics.wast | 2 +- test/dot_s/bcp-1.wast | 2 +- test/dot_s/data-offset-folding.wast | 2 +- test/dot_s/debug.wast | 2 +- test/dot_s/dso_handle.wast | 2 +- test/dot_s/dyncall.wast | 2 +- test/dot_s/exit.wast | 2 +- test/dot_s/export_malloc_free.wast | 2 +- test/dot_s/fix_em_ehsjlj_names.wast | 2 +- test/dot_s/function-data-sections.wast | 2 +- test/dot_s/globals.wast | 2 +- test/dot_s/hostFinalize.wast | 2 +- test/dot_s/indidx.wast | 2 +- test/dot_s/indirect-import.wast | 2 +- test/dot_s/initializers.wast | 2 +- test/dot_s/lcomm-in-text-segment.wast | 2 +- test/dot_s/local_align.wast | 2 +- test/dot_s/macClangMetaData.wast | 2 +- test/dot_s/memops.wast | 2 +- test/dot_s/minimal.wast | 2 +- test/dot_s/permute.wast | 2 +- test/dot_s/relocation.wast | 2 +- test/dot_s/return.wast | 2 +- test/dot_s/start_main0.wast | 2 +- test/dot_s/start_main2.wast | 2 +- test/dot_s/symbolic-offset.wast | 2 +- test/dot_s/text_before_type.wast | 2 +- test/dot_s/unreachable_blocks.wast | 2 +- test/dot_s/visibilities.wast | 2 +- test/dylib.wasm.fromBinary | 2 +- test/dynamicLibrary.fromasm | 2 +- test/dynamicLibrary.fromasm.clamp | 2 +- test/dynamicLibrary.fromasm.clamp.no-opts | 2 +- test/dynamicLibrary.fromasm.imprecise | 2 +- test/dynamicLibrary.fromasm.imprecise.no-opts | 2 +- test/dynamicLibrary.fromasm.no-opts | 2 +- test/emcc_O2_hello_world.fromasm | 2 +- test/emcc_O2_hello_world.fromasm.clamp | 2 +- .../emcc_O2_hello_world.fromasm.clamp.no-opts | 2 +- test/emcc_O2_hello_world.fromasm.imprecise | 2 +- ...c_O2_hello_world.fromasm.imprecise.no-opts | 2 +- test/emcc_O2_hello_world.fromasm.no-opts | 2 +- test/emcc_hello_world.fromasm | 2 +- test/emcc_hello_world.fromasm.clamp | 2 +- test/emcc_hello_world.fromasm.clamp.no-opts | 2 +- test/emcc_hello_world.fromasm.imprecise | 2 +- ...emcc_hello_world.fromasm.imprecise.no-opts | 2 +- test/emcc_hello_world.fromasm.no-opts | 2 +- test/empty.fromasm | 2 +- test/empty.fromasm.clamp | 2 +- test/empty.fromasm.clamp.no-opts | 2 +- test/empty.fromasm.imprecise | 2 +- test/empty.fromasm.imprecise.no-opts | 2 +- test/empty.fromasm.no-opts | 2 +- test/empty_imported_table.wast.from-wast | 2 +- test/empty_imported_table.wast.fromBinary | 2 +- ...imported_table.wast.fromBinary.noDebugInfo | 2 +- test/empty_table.wast.from-wast | 2 +- test/empty_table.wast.fromBinary | 2 +- test/empty_table.wast.fromBinary.noDebugInfo | 2 +- test/example/c-api-hello-world.txt | 2 +- test/example/c-api-kitchen-sink.txt | 18 +-- test/example/c-api-kitchen-sink.txt.txt | 6 +- test/example/c-api-unused-mem.txt | 4 +- test/example/relooper-fuzz.txt | 4 +- test/example/relooper-fuzz1.txt | 4 +- test/fib-dbg.wasm.fromBinary | 11 +- test/hello_world.fromasm | 2 +- test/hello_world.fromasm.clamp | 2 +- test/hello_world.fromasm.clamp.no-opts | 2 +- test/hello_world.fromasm.imprecise | 2 +- test/hello_world.fromasm.imprecise.no-opts | 2 +- test/hello_world.fromasm.no-opts | 2 +- test/hello_world.wast | 2 +- test/hello_world.wast.from-wast | 2 +- test/hello_world.wast.fromBinary | 2 +- test/hello_world.wast.fromBinary.noDebugInfo | 2 +- test/i64-setTempRet0.fromasm | 2 +- test/i64-setTempRet0.fromasm.clamp | 2 +- test/i64-setTempRet0.fromasm.clamp.no-opts | 2 +- test/i64-setTempRet0.fromasm.imprecise | 2 +- .../i64-setTempRet0.fromasm.imprecise.no-opts | 2 +- test/i64-setTempRet0.fromasm.no-opts | 2 +- test/importedSignCast.fromasm | 2 +- test/importedSignCast.fromasm.clamp | 2 +- test/importedSignCast.fromasm.clamp.no-opts | 2 +- test/importedSignCast.fromasm.imprecise | 2 +- ...importedSignCast.fromasm.imprecise.no-opts | 2 +- test/importedSignCast.fromasm.no-opts | 2 +- test/imported_memory.wast.from-wast | 2 +- test/imported_memory.wast.fromBinary | 2 +- ...mported_memory.wast.fromBinary.noDebugInfo | 2 +- test/imported_memory_growth.wast.from-wast | 2 +- test/imported_memory_growth.wast.fromBinary | 2 +- ..._memory_growth.wast.fromBinary.noDebugInfo | 2 +- test/kitchen_sink.wast.from-wast | 2 +- test/kitchen_sink.wast.fromBinary | 2 +- test/kitchen_sink.wast.fromBinary.noDebugInfo | 2 +- test/llvm_autogenerated/byval.wast | 2 +- test/llvm_autogenerated/call.wast | 2 +- test/llvm_autogenerated/cfg-stackify.wast | 2 +- test/llvm_autogenerated/comparisons_f32.wast | 2 +- test/llvm_autogenerated/comparisons_f64.wast | 2 +- test/llvm_autogenerated/comparisons_i32.wast | 2 +- test/llvm_autogenerated/comparisons_i64.wast | 2 +- test/llvm_autogenerated/conv.wast | 2 +- test/llvm_autogenerated/copysign-casts.wast | 2 +- test/llvm_autogenerated/cpus.wast | 2 +- test/llvm_autogenerated/dead-vreg.wast | 2 +- test/llvm_autogenerated/divrem-constant.wast | 2 +- test/llvm_autogenerated/f32.wast | 2 +- test/llvm_autogenerated/f64.wast | 2 +- test/llvm_autogenerated/fast-isel-noreg.wast | 2 +- test/llvm_autogenerated/fast-isel.wast | 2 +- test/llvm_autogenerated/frem.wast | 2 +- test/llvm_autogenerated/func.wast | 2 +- test/llvm_autogenerated/global.wast | 2 +- test/llvm_autogenerated/globl.wast | 2 +- test/llvm_autogenerated/i128.wast | 2 +- .../i32-load-store-alignment.wast | 2 +- test/llvm_autogenerated/i32.wast | 2 +- .../i64-load-store-alignment.wast | 2 +- test/llvm_autogenerated/i64.wast | 2 +- test/llvm_autogenerated/ident.wast | 2 +- test/llvm_autogenerated/immediates.wast | 2 +- test/llvm_autogenerated/indirect-import.wast | 2 +- test/llvm_autogenerated/irreducible-cfg.wast | 2 +- test/llvm_autogenerated/legalize.wast | 2 +- test/llvm_autogenerated/load-ext.wast | 2 +- test/llvm_autogenerated/load-store-i1.wast | 2 +- test/llvm_autogenerated/load.wast | 2 +- .../lower-em-ehsjlj-options.wast | 2 +- test/llvm_autogenerated/mem-intrinsics.wast | 2 +- test/llvm_autogenerated/memory-addr32.wast | 2 +- .../llvm_autogenerated/negative-base-reg.wast | 2 +- .../non-executable-stack.wast | 2 +- test/llvm_autogenerated/offset.wast | 2 +- test/llvm_autogenerated/phi.wast | 2 +- test/llvm_autogenerated/reg-stackify.wast | 2 +- test/llvm_autogenerated/return-int32.wast | 2 +- test/llvm_autogenerated/return-void.wast | 2 +- test/llvm_autogenerated/select.wast | 2 +- test/llvm_autogenerated/signext-zeroext.wast | 2 +- test/llvm_autogenerated/store-trunc.wast | 2 +- test/llvm_autogenerated/store.wast | 2 +- test/llvm_autogenerated/switch.wast | 2 +- test/llvm_autogenerated/unreachable.wast | 2 +- test/llvm_autogenerated/unused-argument.wast | 2 +- test/llvm_autogenerated/userstack.wast | 2 +- test/llvm_autogenerated/varargs.wast | 2 +- test/memory-import.wast.from-wast | 2 +- test/memory-import.wast.fromBinary | 2 +- .../memory-import.wast.fromBinary.noDebugInfo | 2 +- test/memorygrowth.fromasm | 2 +- test/memorygrowth.fromasm.clamp | 2 +- test/memorygrowth.fromasm.clamp.no-opts | 2 +- test/memorygrowth.fromasm.imprecise | 2 +- test/memorygrowth.fromasm.imprecise.no-opts | 2 +- test/memorygrowth.fromasm.no-opts | 2 +- test/merge/basics.wast.combined | 2 +- test/merge/basics.wast.combined.finalized | 2 +- test/merge/basics.wast.combined.finalized.opt | 2 +- test/merge/basics.wast.combined.opt | 2 +- test/merge/dylib.wasm.combined | 2 +- test/merge/dylib.wasm.combined.finalized | 2 +- test/merge/dylib.wasm.combined.finalized.opt | 2 +- test/merge/dylib.wasm.combined.opt | 2 +- test/merge/fusing.wast.combined | 2 +- test/merge/fusing.wast.combined.finalized | 2 +- test/merge/fusing.wast.combined.finalized.opt | 2 +- test/merge/fusing.wast.combined.opt | 2 +- test/merge/global-init.wast.combined | 2 +- .../merge/global-init.wast.combined.finalized | 2 +- .../global-init.wast.combined.finalized.opt | 2 +- test/merge/global-init.wast.combined.opt | 2 +- test/merge/main-lacks-segments.wast.combined | 2 +- ...ain-lacks-segments.wast.combined.finalized | 2 +- ...lacks-segments.wast.combined.finalized.opt | 2 +- .../main-lacks-segments.wast.combined.opt | 2 +- test/merge/post-instantiate-a.wast.combined | 2 +- ...post-instantiate-a.wast.combined.finalized | 2 +- ...-instantiate-a.wast.combined.finalized.opt | 2 +- .../post-instantiate-a.wast.combined.opt | 2 +- test/merge/post-instantiate-b.wast.combined | 2 +- ...post-instantiate-b.wast.combined.finalized | 2 +- ...-instantiate-b.wast.combined.finalized.opt | 2 +- .../post-instantiate-b.wast.combined.opt | 2 +- test/merge/printf.wast.combined | 2 +- test/merge/printf.wast.combined.finalized | 2 +- test/merge/printf.wast.combined.finalized.opt | 2 +- test/merge/printf.wast.combined.opt | 2 +- test/min.fromasm | 2 +- test/min.fromasm.clamp | 2 +- test/min.fromasm.clamp.no-opts | 2 +- test/min.fromasm.imprecise | 2 +- test/min.fromasm.imprecise.no-opts | 2 +- test/min.fromasm.no-opts | 2 +- test/min.wast.from-wast | 2 +- test/min.wast.fromBinary | 2 +- test/min.wast.fromBinary.noDebugInfo | 2 +- test/noffi_f32.fromasm | 2 +- test/noffi_f32.fromasm.clamp | 2 +- test/noffi_f32.fromasm.clamp.no-opts | 2 +- test/noffi_f32.fromasm.imprecise | 2 +- test/noffi_f32.fromasm.imprecise.no-opts | 2 +- test/noffi_f32.fromasm.no-opts | 2 +- test/noffi_i64.fromasm | 2 +- test/noffi_i64.fromasm.clamp | 2 +- test/noffi_i64.fromasm.clamp.no-opts | 2 +- test/noffi_i64.fromasm.imprecise | 2 +- test/noffi_i64.fromasm.imprecise.no-opts | 2 +- test/noffi_i64.fromasm.no-opts | 2 +- test/passes/O.bin.txt | 2 +- test/passes/O.txt | 2 +- test/passes/Oz.txt | 2 +- test/passes/coalesce-locals-learning.txt | 2 +- test/passes/coalesce-locals.txt | 2 +- .../code-pushing_ignore-implicit-traps.txt | 2 +- test/passes/dce.txt | 2 +- test/passes/dce_vacuum.bin.txt | 2 +- test/passes/dce_vacuum.txt | 2 +- .../passes/duplicate-function-elimination.txt | 146 +++++++++--------- test/passes/flatten-control-flow.bin.txt | 2 +- test/passes/flatten-control-flow.txt | 2 +- test/passes/inlining.txt | 2 +- test/passes/instrument-locals.txt | 2 +- test/passes/instrument-memory.txt | 2 +- test/passes/local-cse.txt | 2 +- .../local-cse_ignore-implicit-traps.txt | 2 +- test/passes/log-execution.txt | 2 +- test/passes/memory-packing.txt | 6 +- test/passes/merge-blocks.txt | 2 +- test/passes/metrics.txt | 4 +- test/passes/nm.txt | 2 +- test/passes/optimize-instructions.txt | 2 +- ...optimize-level=2_ignore-implicit-traps.txt | 2 +- test/passes/pick-load-signs.txt | 2 +- test/passes/post-emscripten.txt | 2 +- test/passes/precompute.txt | 2 +- .../precompute_coalesce-locals_vacuum.txt | 2 +- test/passes/print-call-graph.txt | 2 +- test/passes/remove-imports.txt | 2 +- test/passes/remove-memory.txt | 2 +- test/passes/remove-unused-brs.txt | 2 +- ...rs_precompute_vacuum_remove-unused-brs.txt | 2 +- .../remove-unused-brs_shrink-level=1.txt | 2 +- ...s_shrink-level=1_ignore-implicit-traps.txt | 2 +- test/passes/remove-unused-module-elements.txt | 8 +- test/passes/remove-unused-names.txt | 2 +- .../remove-unused-names_merge-blocks.txt | 2 +- .../passes/remove-unused-names_precompute.txt | 2 +- ...-unused-names_remove-unused-brs_vacuum.txt | 2 +- test/passes/remove-unused-names_vacuum.txt | 2 +- test/passes/reorder-functions.txt | 2 +- test/passes/reorder-locals.txt | 2 +- test/passes/rereloop.txt | 2 +- ..._remove-unused-brs_merge-blocks_vacuum.txt | 2 +- test/passes/simplify-locals-nostructure.txt | 2 +- .../simplify-locals-notee-nostructure.txt | 2 +- test/passes/simplify-locals-notee.txt | 2 +- test/passes/simplify-locals.txt | 2 +- test/passes/ssa.txt | 2 +- test/passes/untee.txt | 2 +- test/passes/vacuum.txt | 2 +- ...acuum_remove-unused-names_merge-blocks.txt | 2 +- test/reg_switch.wast.from-wast | 2 +- test/reg_switch.wast.fromBinary | 2 +- test/reg_switch.wast.fromBinary.noDebugInfo | 2 +- test/spec | 2 +- test/stacky.wasm.fromBinary | 2 +- test/table-import.wast.from-wast | 2 +- test/table-import.wast.fromBinary | 2 +- test/table-import.wast.fromBinary.noDebugInfo | 2 +- test/two_sides.fromasm | 2 +- test/two_sides.fromasm.clamp | 2 +- test/two_sides.fromasm.clamp.no-opts | 2 +- test/two_sides.fromasm.imprecise | 2 +- test/two_sides.fromasm.imprecise.no-opts | 2 +- test/two_sides.fromasm.no-opts | 2 +- test/unit.fromasm | 2 +- test/unit.fromasm.clamp | 2 +- test/unit.fromasm.clamp.no-opts | 2 +- test/unit.fromasm.imprecise | 2 +- test/unit.fromasm.imprecise.no-opts | 2 +- test/unit.fromasm.no-opts | 2 +- test/unit.wast.from-wast | 2 +- test/unit.wast.fromBinary | 2 +- test/unit.wast.fromBinary.noDebugInfo | 2 +- test/unreachable-import_wasm-only.fromasm | 2 +- ...unreachable-import_wasm-only.fromasm.clamp | 2 +- ...ble-import_wasm-only.fromasm.clamp.no-opts | 2 +- ...achable-import_wasm-only.fromasm.imprecise | 2 +- ...import_wasm-only.fromasm.imprecise.no-opts | 2 +- ...reachable-import_wasm-only.fromasm.no-opts | 2 +- test/use-import-and-drop.fromasm | 2 +- test/use-import-and-drop.fromasm.clamp | 2 +- .../use-import-and-drop.fromasm.clamp.no-opts | 2 +- test/use-import-and-drop.fromasm.imprecise | 2 +- ...-import-and-drop.fromasm.imprecise.no-opts | 2 +- test/use-import-and-drop.fromasm.no-opts | 2 +- test/wasm-only.fromasm | 2 +- test/wasm-only.fromasm.clamp | 2 +- test/wasm-only.fromasm.clamp.no-opts | 2 +- test/wasm-only.fromasm.imprecise | 2 +- test/wasm-only.fromasm.imprecise.no-opts | 2 +- test/wasm-only.fromasm.no-opts | 2 +- 319 files changed, 423 insertions(+), 420 deletions(-) diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp index 340266fcf76..b3dddac0efd 100644 --- a/src/passes/Print.cpp +++ b/src/passes/Print.cpp @@ -670,6 +670,9 @@ struct PrintSExpression : public Visitor { printName(curr->name) << ' '; o << curr->initial; if (curr->max && curr->max != Memory::kMaxSize) o << ' ' << curr->max; + o << ' '; + if (!curr->shared) o << "not"; + o << "shared"; o << ")"; } void visitMemory(Memory* curr) { diff --git a/src/wasm.h b/src/wasm.h index f1f16a46921..56432faf980 100644 --- a/src/wasm.h +++ b/src/wasm.h @@ -632,8 +632,9 @@ class Memory { // See comment in Table. bool exists; bool imported; + bool shared; - Memory() : initial(0), max(kMaxSize), exists(false), imported(false) { + Memory() : initial(0), max(kMaxSize), exists(false), imported(false), shared(false) { name = Name::fromInt(0); } }; diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp index 59043f3b8ff..c6915cad790 100644 --- a/src/wasm/wasm-s-parser.cpp +++ b/src/wasm/wasm-s-parser.cpp @@ -1444,6 +1444,7 @@ void SExpressionWasmBuilder::parseMemory(Element& s, bool preParseImport) { if (wasm.memory.exists) throw ParseException("too many memories"); wasm.memory.exists = true; wasm.memory.imported = preParseImport; + wasm.memory.shared = false; Index i = 1; if (s[i]->dollared()) { wasm.memory.name = s[i++]->str(); @@ -1480,12 +1481,19 @@ void SExpressionWasmBuilder::parseMemory(Element& s, bool preParseImport) { } wasm.memory.initial = getCheckedAddress(s[i++], "excessive memory init"); if (i == s.size()) return; - if (s[i]->isStr()) { - uint64_t max = atoll(s[i]->c_str()); + // Parse memory limits. + while (i < s.size() && s[i]->isStr()) { + auto* curr = s[i]->c_str(); + i++; + if (strstr(curr, "shared")) { + wasm.memory.shared = strncmp(curr, "notshared", 9) != 0; + break; + } + uint64_t max = atoll(curr); if (max > Memory::kMaxSize) throw ParseException("total memory must be <= 4GB"); wasm.memory.max = max; - i++; } + // Parse memory initializers. while (i < s.size()) { Element& curr = *s[i]; size_t j = 1; diff --git a/test/break-to-return.wasm.fromBinary b/test/break-to-return.wasm.fromBinary index 0bf75cc8bab..f647e665640 100644 --- a/test/break-to-return.wasm.fromBinary +++ b/test/break-to-return.wasm.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "add" (func $0)) (func $0 (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (block $binaryen|break-to-return (result i32) diff --git a/test/debugInfo.fromasm b/test/debugInfo.fromasm index f1100084119..3e571218ab1 100644 --- a/test/debugInfo.fromasm +++ b/test/debugInfo.fromasm @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.clamp b/test/debugInfo.fromasm.clamp index f1100084119..3e571218ab1 100644 --- a/test/debugInfo.fromasm.clamp +++ b/test/debugInfo.fromasm.clamp @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.clamp.no-opts b/test/debugInfo.fromasm.clamp.no-opts index c56627bcbea..39f7a7034f1 100644 --- a/test/debugInfo.fromasm.clamp.no-opts +++ b/test/debugInfo.fromasm.clamp.no-opts @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.imprecise b/test/debugInfo.fromasm.imprecise index 824ade74e73..377ffda44bb 100644 --- a/test/debugInfo.fromasm.imprecise +++ b/test/debugInfo.fromasm.imprecise @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.imprecise.no-opts b/test/debugInfo.fromasm.imprecise.no-opts index 1ec751ef4d0..22549a9d180 100644 --- a/test/debugInfo.fromasm.imprecise.no-opts +++ b/test/debugInfo.fromasm.imprecise.no-opts @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.no-opts b/test/debugInfo.fromasm.no-opts index c56627bcbea..39f7a7034f1 100644 --- a/test/debugInfo.fromasm.no-opts +++ b/test/debugInfo.fromasm.no-opts @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/dot_s/alias.wast b/test/dot_s/alias.wast index 7e439bccb4b..81dc7d52975 100644 --- a/test/dot_s/alias.wast +++ b/test/dot_s/alias.wast @@ -1,6 +1,6 @@ (module (type $FUNCSIG$v (func)) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 2 2 anyfunc) (elem (i32.const 0) $__wasm_nullptr $__exit) (data (i32.const 16) "\d2\04\00\00\00\00\00\00)\t\00\00") diff --git a/test/dot_s/alternate-lcomm.wast b/test/dot_s/alternate-lcomm.wast index 625760209ae..d38a9de58ae 100644 --- a/test/dot_s/alternate-lcomm.wast +++ b/test/dot_s/alternate-lcomm.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast index 3e9ffce6534..fb54ad3efa3 100644 --- a/test/dot_s/asm_const.wast +++ b/test/dot_s/asm_const.wast @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vi (func (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (import "env" "emscripten_asm_const_v" (func $emscripten_asm_const_v (param i32))) (table 0 anyfunc) (data (i32.const 16) "{ Module.print(\"hello, world!\"); }\00") diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast index abdbaaa5aa2..4a7f5eaf746 100644 --- a/test/dot_s/basics.wast +++ b/test/dot_s/basics.wast @@ -3,7 +3,7 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "puts" (func $puts (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 2 2 anyfunc) (elem (i32.const 0) $__wasm_nullptr $main) (data (i32.const 16) "hello, world!\n\00") diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast index 1c35fdf763b..23c56ab4726 100644 --- a/test/dot_s/bcp-1.wast +++ b/test/dot_s/bcp-1.wast @@ -5,7 +5,7 @@ (type $FUNCSIG$vi (func (param i32))) (import "env" "abort" (func $abort)) (import "env" "exit" (func $exit (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 18 18 anyfunc) (elem (i32.const 0) $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2) (data (i32.const 16) "\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00") diff --git a/test/dot_s/data-offset-folding.wast b/test/dot_s/data-offset-folding.wast index 074c8681fe5..3e356295079 100644 --- a/test/dot_s/data-offset-folding.wast +++ b/test/dot_s/data-offset-folding.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 12) "\00\00\00\00") (data (i32.const 416) "`\00\00\00") diff --git a/test/dot_s/debug.wast b/test/dot_s/debug.wast index 57079919a19..0ef17916aa6 100644 --- a/test/dot_s/debug.wast +++ b/test/dot_s/debug.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/dso_handle.wast b/test/dot_s/dso_handle.wast index cdfc998df84..06257400f80 100644 --- a/test/dot_s/dso_handle.wast +++ b/test/dot_s/dso_handle.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/dyncall.wast b/test/dot_s/dyncall.wast index 19f6e00bc85..bd59243dc9a 100644 --- a/test/dot_s/dyncall.wast +++ b/test/dot_s/dyncall.wast @@ -4,7 +4,7 @@ (type $FUNCSIG$if (func (param f32) (result i32))) (type $FUNCSIG$vd (func (param f64))) (type $FUNCSIG$ffjjdi (func (param f32 i64 i64 f64 i32) (result f32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 6 6 anyfunc) (elem (i32.const 0) $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2) (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/exit.wast b/test/dot_s/exit.wast index 4f585d13cc6..129ab052fb1 100644 --- a/test/dot_s/exit.wast +++ b/test/dot_s/exit.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$vi (func (param i32))) (import "env" "exit" (func $exit (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/export_malloc_free.wast b/test/dot_s/export_malloc_free.wast index 7d601ff2196..5de87e6f6d7 100644 --- a/test/dot_s/export_malloc_free.wast +++ b/test/dot_s/export_malloc_free.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/fix_em_ehsjlj_names.wast b/test/dot_s/fix_em_ehsjlj_names.wast index 429e2349430..fe0e8a4a1b7 100644 --- a/test/dot_s/fix_em_ehsjlj_names.wast +++ b/test/dot_s/fix_em_ehsjlj_names.wast @@ -12,7 +12,7 @@ (import "env" "invoke_iii" (func $invoke_iii (param i32 i32 i32) (result i32))) (import "env" "invoke_iiii" (func $invoke_iiii (param i32 i32 i32 i32) (result i32))) (import "env" "invoke_v" (func $invoke_v (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 5 5 anyfunc) (elem (i32.const 0) $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_) (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/function-data-sections.wast b/test/dot_s/function-data-sections.wast index 64a7a67d4cb..41162cb3b9c 100644 --- a/test/dot_s/function-data-sections.wast +++ b/test/dot_s/function-data-sections.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 12) "\00\00\00\00") (data (i32.const 16) "\01\00\00\00") diff --git a/test/dot_s/globals.wast b/test/dot_s/globals.wast index 2fe329a8cd4..3f8b9723b62 100644 --- a/test/dot_s/globals.wast +++ b/test/dot_s/globals.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (import "env" "imported_global" (global $imported_global i32)) (table 0 anyfunc) (data (i32.const 12) "\11\00\00\00") diff --git a/test/dot_s/hostFinalize.wast b/test/dot_s/hostFinalize.wast index 79ba6be0e50..5c2bc670840 100644 --- a/test/dot_s/hostFinalize.wast +++ b/test/dot_s/hostFinalize.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast index 07e63662131..e442edff2f8 100644 --- a/test/dot_s/indidx.wast +++ b/test/dot_s/indidx.wast @@ -2,7 +2,7 @@ (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$v (func)) (import "env" "getchar" (func $getchar (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 5 5 anyfunc) (elem (i32.const 0) $__wasm_nullptr $c $b $d $a) (data (i32.const 16) "\04\00\00\00\02\00\00\00\01\00\00\00\03\00\00\00") diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast index 8df5e85a5bd..c435f0c7534 100644 --- a/test/dot_s/indirect-import.wast +++ b/test/dot_s/indirect-import.wast @@ -7,7 +7,7 @@ (import "env" "extern_ijidf" (func $extern_ijidf (param i64 i32 f64 f32) (result i32))) (import "env" "extern_v" (func $extern_v)) (import "env" "extern_vj" (func $extern_vj (param i64))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (import "env" "extern_fd" (func $extern_fd (param f64) (result f32))) (import "env" "extern_struct" (func $extern_struct (param i32))) (import "env" "extern_sret" (func $extern_sret (param i32))) diff --git a/test/dot_s/initializers.wast b/test/dot_s/initializers.wast index 1c51f433f33..da71fa9b7cc 100644 --- a/test/dot_s/initializers.wast +++ b/test/dot_s/initializers.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/lcomm-in-text-segment.wast b/test/dot_s/lcomm-in-text-segment.wast index bbd7d8c4809..18499d1e820 100644 --- a/test/dot_s/lcomm-in-text-segment.wast +++ b/test/dot_s/lcomm-in-text-segment.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 20) "\10\00\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/local_align.wast b/test/dot_s/local_align.wast index 1991656fda2..5ff774f6120 100644 --- a/test/dot_s/local_align.wast +++ b/test/dot_s/local_align.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/macClangMetaData.wast b/test/dot_s/macClangMetaData.wast index 2dd3ff2d2d7..6860f04fd0f 100644 --- a/test/dot_s/macClangMetaData.wast +++ b/test/dot_s/macClangMetaData.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "puts" (func $puts (param i32) (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 16) "Hello, World!\00") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast index 5cf90fcc7c7..9884ede114d 100644 --- a/test/dot_s/memops.wast +++ b/test/dot_s/memops.wast @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vi (func (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (import "env" "emscripten_asm_const_v" (func $emscripten_asm_const_v (param i32))) (table 0 anyfunc) (data (i32.const 16) "{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }\00") diff --git a/test/dot_s/minimal.wast b/test/dot_s/minimal.wast index 05c2aafc02f..06599ab9d8e 100644 --- a/test/dot_s/minimal.wast +++ b/test/dot_s/minimal.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/permute.wast b/test/dot_s/permute.wast index 9aa6a1d9b4d..3ae71352754 100644 --- a/test/dot_s/permute.wast +++ b/test/dot_s/permute.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 16) "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/relocation.wast b/test/dot_s/relocation.wast index c0518095490..7736643feba 100644 --- a/test/dot_s/relocation.wast +++ b/test/dot_s/relocation.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 12) "\10\00\00\00") (data (i32.const 16) "\0c\00\00\00") diff --git a/test/dot_s/return.wast b/test/dot_s/return.wast index 95a7cf98996..a8a2eddb8e7 100644 --- a/test/dot_s/return.wast +++ b/test/dot_s/return.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/start_main0.wast b/test/dot_s/start_main0.wast index 1ffa0a347bb..fde98d3f13f 100644 --- a/test/dot_s/start_main0.wast +++ b/test/dot_s/start_main0.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/start_main2.wast b/test/dot_s/start_main2.wast index 1b5a2f50e6a..d7438333150 100644 --- a/test/dot_s/start_main2.wast +++ b/test/dot_s/start_main2.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/symbolic-offset.wast b/test/dot_s/symbolic-offset.wast index 7ec41fff942..62a185acc4d 100644 --- a/test/dot_s/symbolic-offset.wast +++ b/test/dot_s/symbolic-offset.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 12) "\01\00\00\00\00\00\00\00\00\00\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/text_before_type.wast b/test/dot_s/text_before_type.wast index 29edaa45d78..25a744dff33 100644 --- a/test/dot_s/text_before_type.wast +++ b/test/dot_s/text_before_type.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/unreachable_blocks.wast b/test/dot_s/unreachable_blocks.wast index ecaa790145c..a2592669727 100644 --- a/test/dot_s/unreachable_blocks.wast +++ b/test/dot_s/unreachable_blocks.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/visibilities.wast b/test/dot_s/visibilities.wast index 4cb94d2ce8d..62cd6d143dd 100644 --- a/test/dot_s/visibilities.wast +++ b/test/dot_s/visibilities.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dylib.wasm.fromBinary b/test/dylib.wasm.fromBinary index aff341754e0..fb832660d92 100644 --- a/test/dylib.wasm.fromBinary +++ b/test/dylib.wasm.fromBinary @@ -4,7 +4,7 @@ (type $2 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (global $global$0 (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm b/test/dynamicLibrary.fromasm index cd0d1d224b6..03148e3f0a3 100644 --- a/test/dynamicLibrary.fromasm +++ b/test/dynamicLibrary.fromasm @@ -4,7 +4,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "tableBase" (global $tableBase i32)) (global $STACKTOP (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm.clamp b/test/dynamicLibrary.fromasm.clamp index cd0d1d224b6..03148e3f0a3 100644 --- a/test/dynamicLibrary.fromasm.clamp +++ b/test/dynamicLibrary.fromasm.clamp @@ -4,7 +4,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "tableBase" (global $tableBase i32)) (global $STACKTOP (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm.clamp.no-opts b/test/dynamicLibrary.fromasm.clamp.no-opts index cbfb2e4fd3f..c8d39c19f8b 100644 --- a/test/dynamicLibrary.fromasm.clamp.no-opts +++ b/test/dynamicLibrary.fromasm.clamp.no-opts @@ -10,7 +10,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (global $DYNAMICTOP_PTR (mut i32) (get_global $DYNAMICTOP_PTR$asm2wasm$import)) (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) diff --git a/test/dynamicLibrary.fromasm.imprecise b/test/dynamicLibrary.fromasm.imprecise index d30a1c912cf..71a4ae9edda 100644 --- a/test/dynamicLibrary.fromasm.imprecise +++ b/test/dynamicLibrary.fromasm.imprecise @@ -4,7 +4,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "tableBase" (global $tableBase i32)) (global $STACKTOP (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm.imprecise.no-opts b/test/dynamicLibrary.fromasm.imprecise.no-opts index cbfb2e4fd3f..c8d39c19f8b 100644 --- a/test/dynamicLibrary.fromasm.imprecise.no-opts +++ b/test/dynamicLibrary.fromasm.imprecise.no-opts @@ -10,7 +10,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (global $DYNAMICTOP_PTR (mut i32) (get_global $DYNAMICTOP_PTR$asm2wasm$import)) (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) diff --git a/test/dynamicLibrary.fromasm.no-opts b/test/dynamicLibrary.fromasm.no-opts index cbfb2e4fd3f..c8d39c19f8b 100644 --- a/test/dynamicLibrary.fromasm.no-opts +++ b/test/dynamicLibrary.fromasm.no-opts @@ -10,7 +10,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (global $DYNAMICTOP_PTR (mut i32) (get_global $DYNAMICTOP_PTR$asm2wasm$import)) (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm index b0128b509e7..8c9431ee892 100644 --- a/test/emcc_O2_hello_world.fromasm +++ b/test/emcc_O2_hello_world.fromasm @@ -23,7 +23,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.clamp b/test/emcc_O2_hello_world.fromasm.clamp index b0128b509e7..8c9431ee892 100644 --- a/test/emcc_O2_hello_world.fromasm.clamp +++ b/test/emcc_O2_hello_world.fromasm.clamp @@ -23,7 +23,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.clamp.no-opts b/test/emcc_O2_hello_world.fromasm.clamp.no-opts index 427135b306d..8f8208c269f 100644 --- a/test/emcc_O2_hello_world.fromasm.clamp.no-opts +++ b/test/emcc_O2_hello_world.fromasm.clamp.no-opts @@ -27,7 +27,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise index 824fcd3da05..92ecaa03309 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise +++ b/test/emcc_O2_hello_world.fromasm.imprecise @@ -23,7 +23,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts index 9ae5ccea155..241f6d5cc7b 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts @@ -27,7 +27,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts index 427135b306d..8f8208c269f 100644 --- a/test/emcc_O2_hello_world.fromasm.no-opts +++ b/test/emcc_O2_hello_world.fromasm.no-opts @@ -27,7 +27,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index 9d87a0e2cb6..69094953128 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -29,7 +29,7 @@ (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.clamp b/test/emcc_hello_world.fromasm.clamp index 24b65fc1f05..421490256fd 100644 --- a/test/emcc_hello_world.fromasm.clamp +++ b/test/emcc_hello_world.fromasm.clamp @@ -27,7 +27,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.clamp.no-opts b/test/emcc_hello_world.fromasm.clamp.no-opts index 3662e5d3617..a4aada5f900 100644 --- a/test/emcc_hello_world.fromasm.clamp.no-opts +++ b/test/emcc_hello_world.fromasm.clamp.no-opts @@ -31,7 +31,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index ed7ba8aa4b3..3ee061df271 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -27,7 +27,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts index da6f2fdc57c..cc7828d7c57 100644 --- a/test/emcc_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_hello_world.fromasm.imprecise.no-opts @@ -31,7 +31,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts index 5f9e12f8347..902abd12685 100644 --- a/test/emcc_hello_world.fromasm.no-opts +++ b/test/emcc_hello_world.fromasm.no-opts @@ -33,7 +33,7 @@ (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm b/test/empty.fromasm index 0e8d5c63bde..8cfdc6a0c67 100644 --- a/test/empty.fromasm +++ b/test/empty.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.clamp b/test/empty.fromasm.clamp index 0e8d5c63bde..8cfdc6a0c67 100644 --- a/test/empty.fromasm.clamp +++ b/test/empty.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.clamp.no-opts b/test/empty.fromasm.clamp.no-opts index ddb433043ea..8c0fb002264 100644 --- a/test/empty.fromasm.clamp.no-opts +++ b/test/empty.fromasm.clamp.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.imprecise b/test/empty.fromasm.imprecise index ddb433043ea..8c0fb002264 100644 --- a/test/empty.fromasm.imprecise +++ b/test/empty.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.imprecise.no-opts b/test/empty.fromasm.imprecise.no-opts index ddb433043ea..8c0fb002264 100644 --- a/test/empty.fromasm.imprecise.no-opts +++ b/test/empty.fromasm.imprecise.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.no-opts b/test/empty.fromasm.no-opts index ddb433043ea..8c0fb002264 100644 --- a/test/empty.fromasm.no-opts +++ b/test/empty.fromasm.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty_imported_table.wast.from-wast b/test/empty_imported_table.wast.from-wast index 1ad108fdedf..822385a908e 100644 --- a/test/empty_imported_table.wast.from-wast +++ b/test/empty_imported_table.wast.from-wast @@ -1,4 +1,4 @@ (module (import "env" "table" (table 0 0 anyfunc)) - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/empty_imported_table.wast.fromBinary b/test/empty_imported_table.wast.fromBinary index 9e0c240cd78..cecd5b73416 100644 --- a/test/empty_imported_table.wast.fromBinary +++ b/test/empty_imported_table.wast.fromBinary @@ -1,5 +1,5 @@ (module (import "env" "table" (table 0 0 anyfunc)) - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/empty_imported_table.wast.fromBinary.noDebugInfo b/test/empty_imported_table.wast.fromBinary.noDebugInfo index 9e0c240cd78..cecd5b73416 100644 --- a/test/empty_imported_table.wast.fromBinary.noDebugInfo +++ b/test/empty_imported_table.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module (import "env" "table" (table 0 0 anyfunc)) - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/empty_table.wast.from-wast b/test/empty_table.wast.from-wast index 7254336c546..af96c7193f0 100644 --- a/test/empty_table.wast.from-wast +++ b/test/empty_table.wast.from-wast @@ -1,4 +1,4 @@ (module (table 0 0 anyfunc) - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/empty_table.wast.fromBinary b/test/empty_table.wast.fromBinary index 07bab7efa35..64828f985dc 100644 --- a/test/empty_table.wast.fromBinary +++ b/test/empty_table.wast.fromBinary @@ -1,5 +1,5 @@ (module (table 0 0 anyfunc) - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/empty_table.wast.fromBinary.noDebugInfo b/test/empty_table.wast.fromBinary.noDebugInfo index 07bab7efa35..64828f985dc 100644 --- a/test/empty_table.wast.fromBinary.noDebugInfo +++ b/test/empty_table.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module (table 0 0 anyfunc) - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/example/c-api-hello-world.txt b/test/example/c-api-hello-world.txt index 640074360b4..930d17aea6a 100644 --- a/test/example/c-api-hello-world.txt +++ b/test/example/c-api-hello-world.txt @@ -1,6 +1,6 @@ (module (type $iii (func (param i32 i32) (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $adder (type $iii) (param $0 i32) (param $1 i32) (result i32) (i32.add (get_local $0) diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index d366a3c7ffe..9f03914fe1e 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -14,7 +14,7 @@ BinaryenFloat64: 4 (import "module" "base" (func $an-imported (param i32 f64) (result f32))) (table 1 1 anyfunc) (elem (i32.const 0) "$kitchen()sinker") - (memory $0 1 256) + (memory $0 1 256 notshared) (data (i32.const 10) "hello, world") (export "kitchen_sinker" (func "$kitchen()sinker")) (export "mem" (memory $0)) @@ -542,7 +542,7 @@ raw: (type $vi (func (param i32))) (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $just-one-block (type $v) (local $0 i32) (call $check @@ -1025,12 +1025,12 @@ raw: ) optimized: (module - (memory $0 0) + (memory $0 0 notshared) ) module loaded from binary form: (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $adder (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.add (get_local $var$0) @@ -1042,7 +1042,7 @@ module loaded from binary form: (type $vi (func (param i32))) (type $v (func)) (import "spectest" "print" (func $print-i32 (param i32))) - (memory $0 0) + (memory $0 0 notshared) (start $starter) (func $starter (type $v) (call $print-i32 @@ -1053,7 +1053,7 @@ module loaded from binary form: (i32.const 1234) (module (type $v (func)) - (memory $0 0) + (memory $0 0 notshared) (func $func (type $v) (local $0 i32) (set_local $0 @@ -1404,7 +1404,7 @@ int main() { (import "module" "base" (func $an-imported (param i32 f64) (result f32))) (table 1 1 anyfunc) (elem (i32.const 0) "$kitchen()sinker") - (memory $0 1 256) + (memory $0 1 256 notshared) (data (i32.const 10) "hello, world") (export "kitchen_sinker" (func "$kitchen()sinker")) (export "mem" (memory $0)) @@ -2392,7 +2392,7 @@ raw: (type $vi (func (param i32))) (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $just-one-block (type $v) (local $0 i32) (call $check @@ -2879,7 +2879,7 @@ raw: optimized: BinaryenModulePrint(the_module); (module - (memory $0 0) + (memory $0 0 notshared) ) BinaryenModuleDispose(the_module); functionTypes.clear(); diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt index dc35b1f0459..d4ad4eef46a 100644 --- a/test/example/c-api-kitchen-sink.txt.txt +++ b/test/example/c-api-kitchen-sink.txt.txt @@ -9,7 +9,7 @@ (import "module" "base" (func $an-imported (param i32 f64) (result f32))) (table 1 1 anyfunc) (elem (i32.const 0) "$kitchen()sinker") - (memory $0 1 256) + (memory $0 1 256 notshared) (data (i32.const 10) "hello, world") (export "kitchen_sinker" (func "$kitchen()sinker")) (export "mem" (memory $0)) @@ -536,7 +536,7 @@ (type $vi (func (param i32))) (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $just-one-block (type $v) (local $0 i32) (call $check @@ -1018,5 +1018,5 @@ ) ) (module - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/example/c-api-unused-mem.txt b/test/example/c-api-unused-mem.txt index b073d4d0249..46381ed957d 100644 --- a/test/example/c-api-unused-mem.txt +++ b/test/example/c-api-unused-mem.txt @@ -1,7 +1,7 @@ (module (type $rustfn-0-3 (func)) (type $__wasm_start (func)) - (memory $0 1024 1024) + (memory $0 1024 1024 notshared) (export "memory" (memory $0)) (export "main" (func $main)) (export "rust_entry" (func $__wasm_start)) @@ -50,7 +50,7 @@ (module (type $0 (func)) (type $1 (func)) - (memory $0 1024 1024) + (memory $0 1024 1024 notshared) (export "memory" (memory $0)) (export "main" (func $main)) (export "rust_entry" (func $__wasm_start)) diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt index 438a4bca1cd..09e1b007018 100644 --- a/test/example/relooper-fuzz.txt +++ b/test/example/relooper-fuzz.txt @@ -3,7 +3,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1) + (memory $0 1 1 notshared) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) @@ -296,7 +296,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1) + (memory $0 1 1 notshared) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) diff --git a/test/example/relooper-fuzz1.txt b/test/example/relooper-fuzz1.txt index 0214d9c8164..a6fd22e0cfc 100644 --- a/test/example/relooper-fuzz1.txt +++ b/test/example/relooper-fuzz1.txt @@ -3,7 +3,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1) + (memory $0 1 1 notshared) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) @@ -272,7 +272,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1) + (memory $0 1 1 notshared) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary index 3f940fa8ad6..459612d2654 100644 --- a/test/fib-dbg.wasm.fromBinary +++ b/test/fib-dbg.wasm.fromBinary @@ -13,7 +13,7 @@ (import "env" "fb" (global $import$6 i32)) (import "global" "NaN" (global $import$7 f64)) (import "global" "Infinity" (global $import$8 f64)) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $import$11 i32)) (import "env" "tableBase" (global $import$12 i32)) @@ -124,21 +124,17 @@ (local $var$9 i32) (local $var$10 i32) (local $var$11 i32) - ;;@ fib.c:8:0 (block $label$0 (set_local $var$11 (get_global $global$3) ) - ;;@ fib.c:3:0 (set_local $var$6 (i32.gt_s (get_local $var$0) (i32.const 0) ) ) - ;;@ fib.c:8:0 (if - ;;@ fib.c:3:0 (get_local $var$6) (block $label$1 (set_local $var$1 @@ -155,23 +151,19 @@ (set_local $var$4 (i32.const 1) ) - ;;@ fib.c:8:0 (return (get_local $var$4) ) ) ) - ;;@ fib.c:3:0 (loop $label$3 (block $label$4 - ;;@ fib.c:4:0 (set_local $var$3 (i32.add (get_local $var$5) (get_local $var$1) ) ) - ;;@ fib.c:3:0 (set_local $var$9 (i32.add (get_local $var$8) @@ -210,7 +202,6 @@ (br $label$3) ) ) - ;;@ fib.c:8:0 (return (get_local $var$4) ) diff --git a/test/hello_world.fromasm b/test/hello_world.fromasm index 51c2fd31d6a..fa5c0f531d7 100644 --- a/test/hello_world.fromasm +++ b/test/hello_world.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.clamp b/test/hello_world.fromasm.clamp index 51c2fd31d6a..fa5c0f531d7 100644 --- a/test/hello_world.fromasm.clamp +++ b/test/hello_world.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.clamp.no-opts b/test/hello_world.fromasm.clamp.no-opts index 3d2e51b9ccd..f823b31fc2d 100644 --- a/test/hello_world.fromasm.clamp.no-opts +++ b/test/hello_world.fromasm.clamp.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.imprecise b/test/hello_world.fromasm.imprecise index 2e4a2f12d51..95eb1977668 100644 --- a/test/hello_world.fromasm.imprecise +++ b/test/hello_world.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.imprecise.no-opts b/test/hello_world.fromasm.imprecise.no-opts index 3d2e51b9ccd..f823b31fc2d 100644 --- a/test/hello_world.fromasm.imprecise.no-opts +++ b/test/hello_world.fromasm.imprecise.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.no-opts b/test/hello_world.fromasm.no-opts index 3d2e51b9ccd..f823b31fc2d 100644 --- a/test/hello_world.fromasm.no-opts +++ b/test/hello_world.fromasm.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.wast b/test/hello_world.wast index ade7bd1ef0d..0c1fe47b81b 100644 --- a/test/hello_world.wast +++ b/test/hello_world.wast @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "add" (func $add)) (func $add (type $0) (param $x i32) (param $y i32) (result i32) (i32.add diff --git a/test/hello_world.wast.from-wast b/test/hello_world.wast.from-wast index ade7bd1ef0d..0c1fe47b81b 100644 --- a/test/hello_world.wast.from-wast +++ b/test/hello_world.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "add" (func $add)) (func $add (type $0) (param $x i32) (param $y i32) (result i32) (i32.add diff --git a/test/hello_world.wast.fromBinary b/test/hello_world.wast.fromBinary index a96857ac927..b3641a7611f 100644 --- a/test/hello_world.wast.fromBinary +++ b/test/hello_world.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "add" (func $add)) (func $add (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.add diff --git a/test/hello_world.wast.fromBinary.noDebugInfo b/test/hello_world.wast.fromBinary.noDebugInfo index 6e2270ecf76..0f0d0c18d31 100644 --- a/test/hello_world.wast.fromBinary.noDebugInfo +++ b/test/hello_world.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "add" (func $0)) (func $0 (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.add diff --git a/test/i64-setTempRet0.fromasm b/test/i64-setTempRet0.fromasm index 078b1f0ef83..021e4c1df55 100644 --- a/test/i64-setTempRet0.fromasm +++ b/test/i64-setTempRet0.fromasm @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.clamp b/test/i64-setTempRet0.fromasm.clamp index 078b1f0ef83..021e4c1df55 100644 --- a/test/i64-setTempRet0.fromasm.clamp +++ b/test/i64-setTempRet0.fromasm.clamp @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.clamp.no-opts b/test/i64-setTempRet0.fromasm.clamp.no-opts index d1f1ed656ab..51f7047e4ac 100644 --- a/test/i64-setTempRet0.fromasm.clamp.no-opts +++ b/test/i64-setTempRet0.fromasm.clamp.no-opts @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.imprecise b/test/i64-setTempRet0.fromasm.imprecise index bda8795579e..cb2257a3114 100644 --- a/test/i64-setTempRet0.fromasm.imprecise +++ b/test/i64-setTempRet0.fromasm.imprecise @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.imprecise.no-opts b/test/i64-setTempRet0.fromasm.imprecise.no-opts index d1f1ed656ab..51f7047e4ac 100644 --- a/test/i64-setTempRet0.fromasm.imprecise.no-opts +++ b/test/i64-setTempRet0.fromasm.imprecise.no-opts @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.no-opts b/test/i64-setTempRet0.fromasm.no-opts index d1f1ed656ab..51f7047e4ac 100644 --- a/test/i64-setTempRet0.fromasm.no-opts +++ b/test/i64-setTempRet0.fromasm.no-opts @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm b/test/importedSignCast.fromasm index 29fdf022443..b88a8e04c03 100644 --- a/test/importedSignCast.fromasm +++ b/test/importedSignCast.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.clamp b/test/importedSignCast.fromasm.clamp index 29fdf022443..b88a8e04c03 100644 --- a/test/importedSignCast.fromasm.clamp +++ b/test/importedSignCast.fromasm.clamp @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.clamp.no-opts b/test/importedSignCast.fromasm.clamp.no-opts index 6043bfdbf88..a6c198ad948 100644 --- a/test/importedSignCast.fromasm.clamp.no-opts +++ b/test/importedSignCast.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.imprecise b/test/importedSignCast.fromasm.imprecise index fbe186610a3..463f65e797f 100644 --- a/test/importedSignCast.fromasm.imprecise +++ b/test/importedSignCast.fromasm.imprecise @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.imprecise.no-opts b/test/importedSignCast.fromasm.imprecise.no-opts index 6043bfdbf88..a6c198ad948 100644 --- a/test/importedSignCast.fromasm.imprecise.no-opts +++ b/test/importedSignCast.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.no-opts b/test/importedSignCast.fromasm.no-opts index 6043bfdbf88..a6c198ad948 100644 --- a/test/importedSignCast.fromasm.no-opts +++ b/test/importedSignCast.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/imported_memory.wast.from-wast b/test/imported_memory.wast.from-wast index ca28ac75150..8e38e6afc26 100644 --- a/test/imported_memory.wast.from-wast +++ b/test/imported_memory.wast.from-wast @@ -1,4 +1,4 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 256 256 anyfunc)) ) diff --git a/test/imported_memory.wast.fromBinary b/test/imported_memory.wast.fromBinary index 3e280b9cb9e..66f1afa364d 100644 --- a/test/imported_memory.wast.fromBinary +++ b/test/imported_memory.wast.fromBinary @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 256 256 anyfunc)) ) diff --git a/test/imported_memory.wast.fromBinary.noDebugInfo b/test/imported_memory.wast.fromBinary.noDebugInfo index 3e280b9cb9e..66f1afa364d 100644 --- a/test/imported_memory.wast.fromBinary.noDebugInfo +++ b/test/imported_memory.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 256 256 anyfunc)) ) diff --git a/test/imported_memory_growth.wast.from-wast b/test/imported_memory_growth.wast.from-wast index 44c5b1644a2..3e4f699ebbf 100644 --- a/test/imported_memory_growth.wast.from-wast +++ b/test/imported_memory_growth.wast.from-wast @@ -1,4 +1,4 @@ (module - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 256 anyfunc)) ) diff --git a/test/imported_memory_growth.wast.fromBinary b/test/imported_memory_growth.wast.fromBinary index d175ff2b274..658a196b6b8 100644 --- a/test/imported_memory_growth.wast.fromBinary +++ b/test/imported_memory_growth.wast.fromBinary @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 256 anyfunc)) ) diff --git a/test/imported_memory_growth.wast.fromBinary.noDebugInfo b/test/imported_memory_growth.wast.fromBinary.noDebugInfo index d175ff2b274..658a196b6b8 100644 --- a/test/imported_memory_growth.wast.fromBinary.noDebugInfo +++ b/test/imported_memory_growth.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 256 anyfunc)) ) diff --git a/test/kitchen_sink.wast.from-wast b/test/kitchen_sink.wast.from-wast index 50e81f1d95a..55e475bdf65 100644 --- a/test/kitchen_sink.wast.from-wast +++ b/test/kitchen_sink.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (memory $0 4096 4096) + (memory $0 4096 4096 notshared) (data (i32.const 1026) "\14\00") (func $kitchensink (type $0) (result i32) (block $block0 (result i32) diff --git a/test/kitchen_sink.wast.fromBinary b/test/kitchen_sink.wast.fromBinary index 9c6d2686a68..a017906a3af 100644 --- a/test/kitchen_sink.wast.fromBinary +++ b/test/kitchen_sink.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (memory $0 4096 4096) + (memory $0 4096 4096 notshared) (data (i32.const 1026) "\14\00") (func $kitchensink (type $0) (result i32) (block $label$0 (result i32) diff --git a/test/kitchen_sink.wast.fromBinary.noDebugInfo b/test/kitchen_sink.wast.fromBinary.noDebugInfo index 4491d80483c..4197963747b 100644 --- a/test/kitchen_sink.wast.fromBinary.noDebugInfo +++ b/test/kitchen_sink.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (memory $0 4096 4096) + (memory $0 4096 4096 notshared) (data (i32.const 1026) "\14\00") (func $0 (type $0) (result i32) (block $label$0 (result i32) diff --git a/test/llvm_autogenerated/byval.wast b/test/llvm_autogenerated/byval.wast index cd9b3933431..6ac30d9e6a3 100644 --- a/test/llvm_autogenerated/byval.wast +++ b/test/llvm_autogenerated/byval.wast @@ -9,7 +9,7 @@ (import "env" "ext_func" (func $ext_func (param i32))) (import "env" "ext_func_empty" (func $ext_func_empty (param i32))) (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/call.wast b/test/llvm_autogenerated/call.wast index 1f3cbb253f2..43021d3f7a9 100644 --- a/test/llvm_autogenerated/call.wast +++ b/test/llvm_autogenerated/call.wast @@ -14,7 +14,7 @@ (import "env" "i32_unary" (func $i32_unary (param i32) (result i32))) (import "env" "i64_nullary" (func $i64_nullary (result i64))) (import "env" "void_nullary" (func $void_nullary)) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast index 910c29f1a89..9b76291bc7d 100644 --- a/test/llvm_autogenerated/cfg-stackify.wast +++ b/test/llvm_autogenerated/cfg-stackify.wast @@ -6,7 +6,7 @@ (import "env" "something" (func $something)) (import "env" "test15_callee0" (func $test15_callee0)) (import "env" "test15_callee1" (func $test15_callee1)) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_f32.wast b/test/llvm_autogenerated/comparisons_f32.wast index 0711f7bd4e7..a71e0d8f8c3 100644 --- a/test/llvm_autogenerated/comparisons_f32.wast +++ b/test/llvm_autogenerated/comparisons_f32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_f64.wast b/test/llvm_autogenerated/comparisons_f64.wast index 2b256e57c03..3ff654b9496 100644 --- a/test/llvm_autogenerated/comparisons_f64.wast +++ b/test/llvm_autogenerated/comparisons_f64.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_i32.wast b/test/llvm_autogenerated/comparisons_i32.wast index 4cac9bd73fc..fb884ce19de 100644 --- a/test/llvm_autogenerated/comparisons_i32.wast +++ b/test/llvm_autogenerated/comparisons_i32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_i64.wast b/test/llvm_autogenerated/comparisons_i64.wast index 213181dfbea..407a9ba8d63 100644 --- a/test/llvm_autogenerated/comparisons_i64.wast +++ b/test/llvm_autogenerated/comparisons_i64.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/conv.wast b/test/llvm_autogenerated/conv.wast index f07ebecca35..869c39748d4 100644 --- a/test/llvm_autogenerated/conv.wast +++ b/test/llvm_autogenerated/conv.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/copysign-casts.wast b/test/llvm_autogenerated/copysign-casts.wast index 66cd3da0501..0a78556e797 100644 --- a/test/llvm_autogenerated/copysign-casts.wast +++ b/test/llvm_autogenerated/copysign-casts.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) (type $FUNCSIG$fff (func (param f32 f32) (result f32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/cpus.wast b/test/llvm_autogenerated/cpus.wast index 5d957835456..6a0d88afafc 100644 --- a/test/llvm_autogenerated/cpus.wast +++ b/test/llvm_autogenerated/cpus.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/dead-vreg.wast b/test/llvm_autogenerated/dead-vreg.wast index 1f81613021f..749e2f18725 100644 --- a/test/llvm_autogenerated/dead-vreg.wast +++ b/test/llvm_autogenerated/dead-vreg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/divrem-constant.wast b/test/llvm_autogenerated/divrem-constant.wast index 25a673cefeb..6443c9be090 100644 --- a/test/llvm_autogenerated/divrem-constant.wast +++ b/test/llvm_autogenerated/divrem-constant.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/f32.wast b/test/llvm_autogenerated/f32.wast index d62e4e046f4..f6174de2fe5 100644 --- a/test/llvm_autogenerated/f32.wast +++ b/test/llvm_autogenerated/f32.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ffff (func (param f32 f32 f32) (result f32))) (import "env" "fmaf" (func $fmaf (param f32 f32 f32) (result f32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/f64.wast b/test/llvm_autogenerated/f64.wast index f3bcd3d8f2e..a2c8221a626 100644 --- a/test/llvm_autogenerated/f64.wast +++ b/test/llvm_autogenerated/f64.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$dddd (func (param f64 f64 f64) (result f64))) (import "env" "fma" (func $fma (param f64 f64 f64) (result f64))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/fast-isel-noreg.wast b/test/llvm_autogenerated/fast-isel-noreg.wast index 82486303bb1..dee038ed85a 100644 --- a/test/llvm_autogenerated/fast-isel-noreg.wast +++ b/test/llvm_autogenerated/fast-isel-noreg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/fast-isel.wast b/test/llvm_autogenerated/fast-isel.wast index 9bc1fb44c4c..4a40993654b 100644 --- a/test/llvm_autogenerated/fast-isel.wast +++ b/test/llvm_autogenerated/fast-isel.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/frem.wast b/test/llvm_autogenerated/frem.wast index 31ba4bb50f6..a96ba03253e 100644 --- a/test/llvm_autogenerated/frem.wast +++ b/test/llvm_autogenerated/frem.wast @@ -3,7 +3,7 @@ (type $FUNCSIG$fff (func (param f32 f32) (result f32))) (import "env" "fmod" (func $fmod (param f64 f64) (result f64))) (import "env" "fmodf" (func $fmodf (param f32 f32) (result f32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/func.wast b/test/llvm_autogenerated/func.wast index dbd9c39abe2..f090a5f1bd7 100644 --- a/test/llvm_autogenerated/func.wast +++ b/test/llvm_autogenerated/func.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast index ccf0da15f83..362553f7c4c 100644 --- a/test/llvm_autogenerated/global.wast +++ b/test/llvm_autogenerated/global.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\b0\08\00\00") (data (i32.const 12) "9\05\00\00") diff --git a/test/llvm_autogenerated/globl.wast b/test/llvm_autogenerated/globl.wast index b3c547bdb60..8fc518fca38 100644 --- a/test/llvm_autogenerated/globl.wast +++ b/test/llvm_autogenerated/globl.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i128.wast b/test/llvm_autogenerated/i128.wast index 3cc5c0aae9d..068bdf8075e 100644 --- a/test/llvm_autogenerated/i128.wast +++ b/test/llvm_autogenerated/i128.wast @@ -9,7 +9,7 @@ (import "env" "__multi3" (func $__multi3 (param i32 i64 i64 i64 i64))) (import "env" "__udivti3" (func $__udivti3 (param i32 i64 i64 i64 i64))) (import "env" "__umodti3" (func $__umodti3 (param i32 i64 i64 i64 i64))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i32-load-store-alignment.wast b/test/llvm_autogenerated/i32-load-store-alignment.wast index c084dd3fac6..fb432a640e9 100644 --- a/test/llvm_autogenerated/i32-load-store-alignment.wast +++ b/test/llvm_autogenerated/i32-load-store-alignment.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i32.wast b/test/llvm_autogenerated/i32.wast index 2ee13f2c3da..e2cf23ec887 100644 --- a/test/llvm_autogenerated/i32.wast +++ b/test/llvm_autogenerated/i32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i64-load-store-alignment.wast b/test/llvm_autogenerated/i64-load-store-alignment.wast index 5d3d4e9632d..1ea70493ce4 100644 --- a/test/llvm_autogenerated/i64-load-store-alignment.wast +++ b/test/llvm_autogenerated/i64-load-store-alignment.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i64.wast b/test/llvm_autogenerated/i64.wast index 2ffbfc9643e..66e04b9f9c8 100644 --- a/test/llvm_autogenerated/i64.wast +++ b/test/llvm_autogenerated/i64.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/ident.wast b/test/llvm_autogenerated/ident.wast index 071206e3b6c..5e22fcb4360 100644 --- a/test/llvm_autogenerated/ident.wast +++ b/test/llvm_autogenerated/ident.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/immediates.wast b/test/llvm_autogenerated/immediates.wast index 6dce33aeb5d..92aac5fcc7e 100644 --- a/test/llvm_autogenerated/immediates.wast +++ b/test/llvm_autogenerated/immediates.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/indirect-import.wast b/test/llvm_autogenerated/indirect-import.wast index f8269e80a39..ef8eeaa5d33 100644 --- a/test/llvm_autogenerated/indirect-import.wast +++ b/test/llvm_autogenerated/indirect-import.wast @@ -8,7 +8,7 @@ (import "env" "extern_ijidf" (func $extern_ijidf (param i64 i32 f64 f32) (result i32))) (import "env" "extern_v" (func $extern_v)) (import "env" "extern_vj" (func $extern_vj (param i64))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (import "env" "extern_fd" (func $extern_fd (param f64) (result f32))) (import "env" "extern_struct" (func $extern_struct (param i32))) (import "env" "extern_sret" (func $extern_sret (param i32))) diff --git a/test/llvm_autogenerated/irreducible-cfg.wast b/test/llvm_autogenerated/irreducible-cfg.wast index e01218f1b3c..3eb44af2d4c 100644 --- a/test/llvm_autogenerated/irreducible-cfg.wast +++ b/test/llvm_autogenerated/irreducible-cfg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast index b3306d42479..fa6bc2ebe55 100644 --- a/test/llvm_autogenerated/legalize.wast +++ b/test/llvm_autogenerated/legalize.wast @@ -2,7 +2,7 @@ (type $FUNCSIG$vijji (func (param i32 i64 i64 i32))) (import "env" "__ashlti3" (func $__ashlti3 (param i32 i64 i64 i32))) (import "env" "__lshrti3" (func $__lshrti3 (param i32 i64 i64 i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/load-ext.wast b/test/llvm_autogenerated/load-ext.wast index 768d5e53959..3caa70017c2 100644 --- a/test/llvm_autogenerated/load-ext.wast +++ b/test/llvm_autogenerated/load-ext.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/load-store-i1.wast b/test/llvm_autogenerated/load-store-i1.wast index 94dc055944f..4cf850378a5 100644 --- a/test/llvm_autogenerated/load-store-i1.wast +++ b/test/llvm_autogenerated/load-store-i1.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/load.wast b/test/llvm_autogenerated/load.wast index 20b3bcf68fa..cecb6a24ffa 100644 --- a/test/llvm_autogenerated/load.wast +++ b/test/llvm_autogenerated/load.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast index becf166b941..a02fa5ebd5f 100644 --- a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast +++ b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast @@ -10,7 +10,7 @@ (import "env" "invoke_v" (func $invoke_v (param i32))) (import "env" "longjmp" (func $longjmp (param i32 i32))) (import "env" "setjmp" (func $setjmp (param i32) (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (import "env" "foo" (func $foo)) (table 2 2 anyfunc) (elem (i32.const 0) $__wasm_nullptr $__importThunk_foo) diff --git a/test/llvm_autogenerated/mem-intrinsics.wast b/test/llvm_autogenerated/mem-intrinsics.wast index 8707407bd74..c1786979ded 100644 --- a/test/llvm_autogenerated/mem-intrinsics.wast +++ b/test/llvm_autogenerated/mem-intrinsics.wast @@ -7,7 +7,7 @@ (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32))) (import "env" "memmove" (func $memmove (param i32 i32 i32) (result i32))) (import "env" "memset" (func $memset (param i32 i32 i32) (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/memory-addr32.wast b/test/llvm_autogenerated/memory-addr32.wast index b81880a6e19..ab7675b53cd 100644 --- a/test/llvm_autogenerated/memory-addr32.wast +++ b/test/llvm_autogenerated/memory-addr32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/negative-base-reg.wast b/test/llvm_autogenerated/negative-base-reg.wast index b3f17724cbc..b08fe840c26 100644 --- a/test/llvm_autogenerated/negative-base-reg.wast +++ b/test/llvm_autogenerated/negative-base-reg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\90\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/non-executable-stack.wast b/test/llvm_autogenerated/non-executable-stack.wast index 071206e3b6c..5e22fcb4360 100644 --- a/test/llvm_autogenerated/non-executable-stack.wast +++ b/test/llvm_autogenerated/non-executable-stack.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/offset.wast b/test/llvm_autogenerated/offset.wast index 1d6e903a71e..8f03de15abe 100644 --- a/test/llvm_autogenerated/offset.wast +++ b/test/llvm_autogenerated/offset.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (data (i32.const 12) "\00\00\00\00") diff --git a/test/llvm_autogenerated/phi.wast b/test/llvm_autogenerated/phi.wast index 3ed5e4409eb..8a3f36da3d8 100644 --- a/test/llvm_autogenerated/phi.wast +++ b/test/llvm_autogenerated/phi.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast index 4917dacc29a..51be796c917 100644 --- a/test/llvm_autogenerated/reg-stackify.wast +++ b/test/llvm_autogenerated/reg-stackify.wast @@ -17,7 +17,7 @@ (import "env" "use_a" (func $use_a (param i32))) (import "env" "use_b" (func $use_b (param i32))) (import "env" "use_memory" (func $use_memory (param i32) (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (data (i32.const 12) "\00\00\00\00") diff --git a/test/llvm_autogenerated/return-int32.wast b/test/llvm_autogenerated/return-int32.wast index 658133704c7..20b0938f7d0 100644 --- a/test/llvm_autogenerated/return-int32.wast +++ b/test/llvm_autogenerated/return-int32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/return-void.wast b/test/llvm_autogenerated/return-void.wast index 09da984a61c..6fc01d3189d 100644 --- a/test/llvm_autogenerated/return-void.wast +++ b/test/llvm_autogenerated/return-void.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/select.wast b/test/llvm_autogenerated/select.wast index f49a78c8ad1..a761d1644c6 100644 --- a/test/llvm_autogenerated/select.wast +++ b/test/llvm_autogenerated/select.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/signext-zeroext.wast b/test/llvm_autogenerated/signext-zeroext.wast index 383af3908c8..6dc93d6c157 100644 --- a/test/llvm_autogenerated/signext-zeroext.wast +++ b/test/llvm_autogenerated/signext-zeroext.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/store-trunc.wast b/test/llvm_autogenerated/store-trunc.wast index b33660666ef..00689396405 100644 --- a/test/llvm_autogenerated/store-trunc.wast +++ b/test/llvm_autogenerated/store-trunc.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/store.wast b/test/llvm_autogenerated/store.wast index f1496dd1f46..8e80f645664 100644 --- a/test/llvm_autogenerated/store.wast +++ b/test/llvm_autogenerated/store.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/switch.wast b/test/llvm_autogenerated/switch.wast index 43dbf2b99c4..b75db6537c9 100644 --- a/test/llvm_autogenerated/switch.wast +++ b/test/llvm_autogenerated/switch.wast @@ -6,7 +6,7 @@ (import "env" "foo3" (func $foo3)) (import "env" "foo4" (func $foo4)) (import "env" "foo5" (func $foo5)) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/unreachable.wast b/test/llvm_autogenerated/unreachable.wast index fc775b2c2aa..81ddf82dda7 100644 --- a/test/llvm_autogenerated/unreachable.wast +++ b/test/llvm_autogenerated/unreachable.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$v (func)) (import "env" "abort" (func $abort)) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/unused-argument.wast b/test/llvm_autogenerated/unused-argument.wast index 2cfb37f4748..e64d29cbe08 100644 --- a/test/llvm_autogenerated/unused-argument.wast +++ b/test/llvm_autogenerated/unused-argument.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$i (func (result i32))) (import "env" "return_something" (func $return_something (result i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast index be1ada7a69c..0814c7295ec 100644 --- a/test/llvm_autogenerated/userstack.wast +++ b/test/llvm_autogenerated/userstack.wast @@ -3,7 +3,7 @@ (import "env" "ext_func" (func $ext_func (param i32))) (import "env" "ext_func_i32" (func $ext_func_i32 (param i32))) (import "env" "use_i8_star" (func $use_i8_star (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast index 96fc57cafee..d7d9e2b0e4e 100644 --- a/test/llvm_autogenerated/varargs.wast +++ b/test/llvm_autogenerated/varargs.wast @@ -2,7 +2,7 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$vi (func (param i32))) (import "env" "callee" (func $callee (param i32))) - (import "env" "memory" (memory $0 1)) + (import "env" "memory" (memory $0 1 notshared)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/memory-import.wast.from-wast b/test/memory-import.wast.from-wast index 70fc97057b9..c2f449bd865 100644 --- a/test/memory-import.wast.from-wast +++ b/test/memory-import.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (import "env" "memory" (memory $0 1 1)) + (import "env" "memory" (memory $0 1 1 notshared)) (func $foo (type $0) (result i32) (i32.load offset=13 (i32.const 37) diff --git a/test/memory-import.wast.fromBinary b/test/memory-import.wast.fromBinary index b83ca836aac..502faa79607 100644 --- a/test/memory-import.wast.fromBinary +++ b/test/memory-import.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (import "env" "memory" (memory $0 1 1)) + (import "env" "memory" (memory $0 1 1 notshared)) (func $foo (type $0) (result i32) (i32.load offset=13 (i32.const 37) diff --git a/test/memory-import.wast.fromBinary.noDebugInfo b/test/memory-import.wast.fromBinary.noDebugInfo index d80f6c2b087..b229201a058 100644 --- a/test/memory-import.wast.fromBinary.noDebugInfo +++ b/test/memory-import.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (import "env" "memory" (memory $0 1 1)) + (import "env" "memory" (memory $0 1 1 notshared)) (func $0 (type $0) (result i32) (i32.load offset=13 (i32.const 37) diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm index a6d77f5cf44..a58db669842 100644 --- a/test/memorygrowth.fromasm +++ b/test/memorygrowth.fromasm @@ -19,7 +19,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.clamp b/test/memorygrowth.fromasm.clamp index a6d77f5cf44..a58db669842 100644 --- a/test/memorygrowth.fromasm.clamp +++ b/test/memorygrowth.fromasm.clamp @@ -19,7 +19,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.clamp.no-opts b/test/memorygrowth.fromasm.clamp.no-opts index 490c479c072..e65f774ec7e 100644 --- a/test/memorygrowth.fromasm.clamp.no-opts +++ b/test/memorygrowth.fromasm.clamp.no-opts @@ -23,7 +23,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise index bd959d564f3..dae539bba9a 100644 --- a/test/memorygrowth.fromasm.imprecise +++ b/test/memorygrowth.fromasm.imprecise @@ -19,7 +19,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts index f2e0cc64460..851afafd7a5 100644 --- a/test/memorygrowth.fromasm.imprecise.no-opts +++ b/test/memorygrowth.fromasm.imprecise.no-opts @@ -23,7 +23,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts index 490c479c072..e65f774ec7e 100644 --- a/test/memorygrowth.fromasm.no-opts +++ b/test/memorygrowth.fromasm.no-opts @@ -23,7 +23,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/merge/basics.wast.combined b/test/merge/basics.wast.combined index f0654ec7a7d..2fa2824c0f0 100644 --- a/test/merge/basics.wast.combined +++ b/test/merge/basics.wast.combined @@ -5,7 +5,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 10 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized index 7637b787b75..f7e8afea0e2 100644 --- a/test/merge/basics.wast.combined.finalized +++ b/test/merge/basics.wast.combined.finalized @@ -5,7 +5,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 18 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt index 119851fb05b..76c5f7efa55 100644 --- a/test/merge/basics.wast.combined.finalized.opt +++ b/test/merge/basics.wast.combined.finalized.opt @@ -1,7 +1,7 @@ (module (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 18 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/basics.wast.combined.opt b/test/merge/basics.wast.combined.opt index c595d00da29..c9a21ba89a7 100644 --- a/test/merge/basics.wast.combined.opt +++ b/test/merge/basics.wast.combined.opt @@ -3,7 +3,7 @@ (type $FUNCSIG$v (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 10 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/dylib.wasm.combined b/test/merge/dylib.wasm.combined index 71df6735691..5658328be24 100644 --- a/test/merge/dylib.wasm.combined +++ b/test/merge/dylib.wasm.combined @@ -8,7 +8,7 @@ (type $2$0 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (import "env" "memoryBase" (global $import$0$0 i32)) diff --git a/test/merge/dylib.wasm.combined.finalized b/test/merge/dylib.wasm.combined.finalized index 2ef9ed1350b..617bb0ddea3 100644 --- a/test/merge/dylib.wasm.combined.finalized +++ b/test/merge/dylib.wasm.combined.finalized @@ -8,7 +8,7 @@ (type $2$0 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (import "env" "memoryBase" (global $import$0$0 i32)) diff --git a/test/merge/dylib.wasm.combined.finalized.opt b/test/merge/dylib.wasm.combined.finalized.opt index 41a24ce30a4..552a1fe3cbd 100644 --- a/test/merge/dylib.wasm.combined.finalized.opt +++ b/test/merge/dylib.wasm.combined.finalized.opt @@ -3,7 +3,7 @@ (type $2 (func (result i32))) (type $3 (func)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) (global $global$0 (mut i32) (i32.const 0)) (global $global$1 (mut i32) (i32.const 0)) diff --git a/test/merge/dylib.wasm.combined.opt b/test/merge/dylib.wasm.combined.opt index 351d05b4161..a79b7388124 100644 --- a/test/merge/dylib.wasm.combined.opt +++ b/test/merge/dylib.wasm.combined.opt @@ -4,7 +4,7 @@ (type $3 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (import "env" "memoryBase" (global $import$0$0 i32)) diff --git a/test/merge/fusing.wast.combined b/test/merge/fusing.wast.combined index 2a7adf6e297..f9138ded692 100644 --- a/test/merge/fusing.wast.combined +++ b/test/merge/fusing.wast.combined @@ -3,7 +3,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/fusing.wast.combined.finalized b/test/merge/fusing.wast.combined.finalized index 7896e448daf..7cdb18cc97b 100644 --- a/test/merge/fusing.wast.combined.finalized +++ b/test/merge/fusing.wast.combined.finalized @@ -3,7 +3,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/fusing.wast.combined.finalized.opt b/test/merge/fusing.wast.combined.finalized.opt index 9df0a5cdcfb..860e25db786 100644 --- a/test/merge/fusing.wast.combined.finalized.opt +++ b/test/merge/fusing.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $FUNCSIG$v (func)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) (global $a-global i32 (i32.const 0)) (global $b-global f64 (f64.const 2.14281428)) diff --git a/test/merge/fusing.wast.combined.opt b/test/merge/fusing.wast.combined.opt index c8d58890e98..df102522eea 100644 --- a/test/merge/fusing.wast.combined.opt +++ b/test/merge/fusing.wast.combined.opt @@ -2,7 +2,7 @@ (type $FUNCSIG$v (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (global $a-global i32 (i32.const 0)) (global $b-global f64 (f64.const 2.14281428)) diff --git a/test/merge/global-init.wast.combined b/test/merge/global-init.wast.combined index 95b33996865..ac4cb799546 100644 --- a/test/merge/global-init.wast.combined +++ b/test/merge/global-init.wast.combined @@ -1,7 +1,7 @@ (module (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) diff --git a/test/merge/global-init.wast.combined.finalized b/test/merge/global-init.wast.combined.finalized index 40a5066fac9..8e4c77986aa 100644 --- a/test/merge/global-init.wast.combined.finalized +++ b/test/merge/global-init.wast.combined.finalized @@ -1,7 +1,7 @@ (module (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) diff --git a/test/merge/global-init.wast.combined.finalized.opt b/test/merge/global-init.wast.combined.finalized.opt index 02a0900f547..376aceeb6a4 100644 --- a/test/merge/global-init.wast.combined.finalized.opt +++ b/test/merge/global-init.wast.combined.finalized.opt @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) ) diff --git a/test/merge/global-init.wast.combined.opt b/test/merge/global-init.wast.combined.opt index 44c047693a7..649c810f1b7 100644 --- a/test/merge/global-init.wast.combined.opt +++ b/test/merge/global-init.wast.combined.opt @@ -1,7 +1,7 @@ (module (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (data (get_global $memoryBase) "") diff --git a/test/merge/main-lacks-segments.wast.combined b/test/merge/main-lacks-segments.wast.combined index 33eb89435f3..cd58c5a224b 100644 --- a/test/merge/main-lacks-segments.wast.combined +++ b/test/merge/main-lacks-segments.wast.combined @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 2 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/main-lacks-segments.wast.combined.finalized b/test/merge/main-lacks-segments.wast.combined.finalized index 923ffd34d15..cc7036171d6 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized +++ b/test/merge/main-lacks-segments.wast.combined.finalized @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 10 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/main-lacks-segments.wast.combined.finalized.opt b/test/merge/main-lacks-segments.wast.combined.finalized.opt index 0aeb4c62deb..8b7816354ab 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized.opt +++ b/test/merge/main-lacks-segments.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 10 anyfunc)) (elem (i32.const 8) $foo $foo) (data (i32.const 1024) "hello, this is some data!") diff --git a/test/merge/main-lacks-segments.wast.combined.opt b/test/merge/main-lacks-segments.wast.combined.opt index 4ea294a8e22..f16c6e960b4 100644 --- a/test/merge/main-lacks-segments.wast.combined.opt +++ b/test/merge/main-lacks-segments.wast.combined.opt @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 2 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/post-instantiate-a.wast.combined b/test/merge/post-instantiate-a.wast.combined index 725e1df287e..88c3a65b9e7 100644 --- a/test/merge/post-instantiate-a.wast.combined +++ b/test/merge/post-instantiate-a.wast.combined @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 0) + (memory $0 0 notshared) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-a.wast.combined.finalized b/test/merge/post-instantiate-a.wast.combined.finalized index e50f84e7997..8bef63ea638 100644 --- a/test/merge/post-instantiate-a.wast.combined.finalized +++ b/test/merge/post-instantiate-a.wast.combined.finalized @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 1) + (memory $0 1 notshared) (data (i32.const 1024) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-a.wast.combined.finalized.opt b/test/merge/post-instantiate-a.wast.combined.finalized.opt index d0a9b4a6a06..b4c76204119 100644 --- a/test/merge/post-instantiate-a.wast.combined.finalized.opt +++ b/test/merge/post-instantiate-a.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 1) + (memory $0 1 notshared) (data (i32.const 1024) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-a.wast.combined.opt b/test/merge/post-instantiate-a.wast.combined.opt index b4ecf737b1f..5caad875739 100644 --- a/test/merge/post-instantiate-a.wast.combined.opt +++ b/test/merge/post-instantiate-a.wast.combined.opt @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (memory $0 0) + (memory $0 0 notshared) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-b.wast.combined b/test/merge/post-instantiate-b.wast.combined index df4bfe76d51..bf98c34a4a8 100644 --- a/test/merge/post-instantiate-b.wast.combined +++ b/test/merge/post-instantiate-b.wast.combined @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 0) + (memory $0 0 notshared) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0$0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-b.wast.combined.finalized b/test/merge/post-instantiate-b.wast.combined.finalized index a6f2d309b50..d3f47ebc57c 100644 --- a/test/merge/post-instantiate-b.wast.combined.finalized +++ b/test/merge/post-instantiate-b.wast.combined.finalized @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 1) + (memory $0 1 notshared) (data (i32.const 1024) "") (export "__post_instantiate" (func $0$0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-b.wast.combined.finalized.opt b/test/merge/post-instantiate-b.wast.combined.finalized.opt index 367bd834b2c..567093ac8f6 100644 --- a/test/merge/post-instantiate-b.wast.combined.finalized.opt +++ b/test/merge/post-instantiate-b.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $0$0 (func)) - (memory $0 1) + (memory $0 1 notshared) (data (i32.const 1024) "") (export "__post_instantiate" (func $0$0)) (func $0$0 (type $0$0) diff --git a/test/merge/post-instantiate-b.wast.combined.opt b/test/merge/post-instantiate-b.wast.combined.opt index b847fc5e876..92a9110a1f1 100644 --- a/test/merge/post-instantiate-b.wast.combined.opt +++ b/test/merge/post-instantiate-b.wast.combined.opt @@ -2,7 +2,7 @@ (type $0$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (memory $0 0) + (memory $0 0 notshared) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0$0)) (func $0$0 (type $0$0) diff --git a/test/merge/printf.wast.combined b/test/merge/printf.wast.combined index f8dcc3d0c53..58540cc3456 100644 --- a/test/merge/printf.wast.combined +++ b/test/merge/printf.wast.combined @@ -4,7 +4,7 @@ (type $1 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) diff --git a/test/merge/printf.wast.combined.finalized b/test/merge/printf.wast.combined.finalized index c72f0d28f94..0f663cf7686 100644 --- a/test/merge/printf.wast.combined.finalized +++ b/test/merge/printf.wast.combined.finalized @@ -4,7 +4,7 @@ (type $1 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) diff --git a/test/merge/printf.wast.combined.finalized.opt b/test/merge/printf.wast.combined.finalized.opt index a801ab875c6..f7c888862c8 100644 --- a/test/merge/printf.wast.combined.finalized.opt +++ b/test/merge/printf.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $FUNCSIG$iii (func (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 8 anyfunc)) (export "_printf" (func $625)) diff --git a/test/merge/printf.wast.combined.opt b/test/merge/printf.wast.combined.opt index ae913e40e4c..4779be0256f 100644 --- a/test/merge/printf.wast.combined.opt +++ b/test/merge/printf.wast.combined.opt @@ -2,7 +2,7 @@ (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (data (get_global $memoryBase) "") diff --git a/test/min.fromasm b/test/min.fromasm index d52aac5d3d3..49c92882749 100644 --- a/test/min.fromasm +++ b/test/min.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.clamp b/test/min.fromasm.clamp index d52aac5d3d3..49c92882749 100644 --- a/test/min.fromasm.clamp +++ b/test/min.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.clamp.no-opts b/test/min.fromasm.clamp.no-opts index d0cc78eb04a..ee7f8290868 100644 --- a/test/min.fromasm.clamp.no-opts +++ b/test/min.fromasm.clamp.no-opts @@ -1,6 +1,6 @@ (module (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.imprecise b/test/min.fromasm.imprecise index aabb1e3a5d3..da246a09ad0 100644 --- a/test/min.fromasm.imprecise +++ b/test/min.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.imprecise.no-opts b/test/min.fromasm.imprecise.no-opts index d0cc78eb04a..ee7f8290868 100644 --- a/test/min.fromasm.imprecise.no-opts +++ b/test/min.fromasm.imprecise.no-opts @@ -1,6 +1,6 @@ (module (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.no-opts b/test/min.fromasm.no-opts index d0cc78eb04a..ee7f8290868 100644 --- a/test/min.fromasm.no-opts +++ b/test/min.fromasm.no-opts @@ -1,6 +1,6 @@ (module (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.wast.from-wast b/test/min.wast.from-wast index 8942f2ff4ef..c3fab650388 100644 --- a/test/min.wast.from-wast +++ b/test/min.wast.from-wast @@ -3,7 +3,7 @@ (type $1 (func (param i32 i32) (result f32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32 i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "floats" (func $floats)) (func $floats (type $0) (param $f f32) (result f32) (local $t f32) diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary index b39388c462b..243d7c2adff 100644 --- a/test/min.wast.fromBinary +++ b/test/min.wast.fromBinary @@ -3,7 +3,7 @@ (type $1 (func (param i32 i32) (result f32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32 i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "floats" (func $floats)) (func $floats (type $0) (param $var$0 f32) (result f32) (local $var$1 f32) diff --git a/test/min.wast.fromBinary.noDebugInfo b/test/min.wast.fromBinary.noDebugInfo index d6ad4be8540..bc589cd27c8 100644 --- a/test/min.wast.fromBinary.noDebugInfo +++ b/test/min.wast.fromBinary.noDebugInfo @@ -3,7 +3,7 @@ (type $1 (func (param i32 i32) (result f32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32 i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "floats" (func $0)) (func $0 (type $0) (param $var$0 f32) (result f32) (local $var$1 f32) diff --git a/test/noffi_f32.fromasm b/test/noffi_f32.fromasm index 4236c215fd8..58edcb1c7b8 100644 --- a/test/noffi_f32.fromasm +++ b/test/noffi_f32.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.clamp b/test/noffi_f32.fromasm.clamp index 4236c215fd8..58edcb1c7b8 100644 --- a/test/noffi_f32.fromasm.clamp +++ b/test/noffi_f32.fromasm.clamp @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.clamp.no-opts b/test/noffi_f32.fromasm.clamp.no-opts index 3e6d142c000..eea21043fda 100644 --- a/test/noffi_f32.fromasm.clamp.no-opts +++ b/test/noffi_f32.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.imprecise b/test/noffi_f32.fromasm.imprecise index 5553a036aa8..2cec94798f9 100644 --- a/test/noffi_f32.fromasm.imprecise +++ b/test/noffi_f32.fromasm.imprecise @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.imprecise.no-opts b/test/noffi_f32.fromasm.imprecise.no-opts index 3e6d142c000..eea21043fda 100644 --- a/test/noffi_f32.fromasm.imprecise.no-opts +++ b/test/noffi_f32.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.no-opts b/test/noffi_f32.fromasm.no-opts index 3e6d142c000..eea21043fda 100644 --- a/test/noffi_f32.fromasm.no-opts +++ b/test/noffi_f32.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm b/test/noffi_i64.fromasm index 65aacd9d310..b4ef86c5e5b 100644 --- a/test/noffi_i64.fromasm +++ b/test/noffi_i64.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.clamp b/test/noffi_i64.fromasm.clamp index 65aacd9d310..b4ef86c5e5b 100644 --- a/test/noffi_i64.fromasm.clamp +++ b/test/noffi_i64.fromasm.clamp @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.clamp.no-opts b/test/noffi_i64.fromasm.clamp.no-opts index f6fd6545456..b0028575289 100644 --- a/test/noffi_i64.fromasm.clamp.no-opts +++ b/test/noffi_i64.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.imprecise b/test/noffi_i64.fromasm.imprecise index 925e2986233..1e1f065f946 100644 --- a/test/noffi_i64.fromasm.imprecise +++ b/test/noffi_i64.fromasm.imprecise @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.imprecise.no-opts b/test/noffi_i64.fromasm.imprecise.no-opts index f6fd6545456..b0028575289 100644 --- a/test/noffi_i64.fromasm.imprecise.no-opts +++ b/test/noffi_i64.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.no-opts b/test/noffi_i64.fromasm.no-opts index f6fd6545456..b0028575289 100644 --- a/test/noffi_i64.fromasm.no-opts +++ b/test/noffi_i64.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/passes/O.bin.txt b/test/passes/O.bin.txt index 9c68478ac6b..91e09636517 100644 --- a/test/passes/O.bin.txt +++ b/test/passes/O.bin.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i64) (result i64))) - (memory $0 0) + (memory $0 0 notshared) (export "fac-rec" (func $0)) (export "fac-rec-named" (func $1)) (export "fac-iter" (func $2)) diff --git a/test/passes/O.txt b/test/passes/O.txt index 4b340dcd73e..f3fa5200fb9 100644 --- a/test/passes/O.txt +++ b/test/passes/O.txt @@ -1,7 +1,7 @@ (module (type $0 (func (result i32))) (type $1 (func (param i64))) - (memory $0 0) + (memory $0 0 notshared) (export "ret" (func $ret)) (export "waka" (func $if-0-unreachable-to-none)) (func $ret (type $0) (result i32) diff --git a/test/passes/Oz.txt b/test/passes/Oz.txt index c6710632642..de468adc67f 100644 --- a/test/passes/Oz.txt +++ b/test/passes/Oz.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32 i32) (result i32))) (type $1 (func (param i32) (result i32))) - (memory $0 100 100) + (memory $0 100 100 notshared) (export "localcse" (func $basics)) (export "localcse-2" (func $8)) (func $basics (type $0) (param $0 i32) (param $1 i32) (result i32) diff --git a/test/passes/coalesce-locals-learning.txt b/test/passes/coalesce-locals-learning.txt index 3bd04680d01..2e66a74edd3 100644 --- a/test/passes/coalesce-locals-learning.txt +++ b/test/passes/coalesce-locals-learning.txt @@ -5,7 +5,7 @@ (type $3 (func (param i32 f32))) (type $4 (func (param i32))) (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32))) - (memory $0 10) + (memory $0 10 notshared) (func $nothing-to-do (type $2) (local $0 i32) (nop) diff --git a/test/passes/coalesce-locals.txt b/test/passes/coalesce-locals.txt index 8f290815307..50c562f3a0d 100644 --- a/test/passes/coalesce-locals.txt +++ b/test/passes/coalesce-locals.txt @@ -9,7 +9,7 @@ (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32))) (import "env" "get" (func $get (result i32))) (import "env" "set" (func $set (param i32))) - (memory $0 10) + (memory $0 10 notshared) (func $nothing-to-do (type $2) (local $0 i32) (nop) diff --git a/test/passes/code-pushing_ignore-implicit-traps.txt b/test/passes/code-pushing_ignore-implicit-traps.txt index b20bc49aac6..05ea9506589 100644 --- a/test/passes/code-pushing_ignore-implicit-traps.txt +++ b/test/passes/code-pushing_ignore-implicit-traps.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $push1 (type $0) (local $x i32) (block $out diff --git a/test/passes/dce.txt b/test/passes/dce.txt index 3597d59ae09..57d0e35ecff 100644 --- a/test/passes/dce.txt +++ b/test/passes/dce.txt @@ -7,7 +7,7 @@ (global $x (mut i32) (i32.const 0)) (table 1 1 anyfunc) (elem (i32.const 0) $call-me) - (memory $0 10) + (memory $0 10 notshared) (func $call-me (type $ii) (param $0 i32) (param $1 i32) (nop) ) diff --git a/test/passes/dce_vacuum.bin.txt b/test/passes/dce_vacuum.bin.txt index d4be4d1f476..d536f979b42 100644 --- a/test/passes/dce_vacuum.bin.txt +++ b/test/passes/dce_vacuum.bin.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param f32 f32) (result f32))) (type $1 (func (param f64 f64) (result f64))) - (memory $0 0) + (memory $0 0 notshared) (export "f32.compute_radix" (func $0)) (export "f64.compute_radix" (func $1)) (func $0 (type $0) (param $var$0 f32) (param $var$1 f32) (result f32) diff --git a/test/passes/dce_vacuum.txt b/test/passes/dce_vacuum.txt index ac61cce04ec..7e204c5960f 100644 --- a/test/passes/dce_vacuum.txt +++ b/test/passes/dce_vacuum.txt @@ -2,7 +2,7 @@ (type $0 (func (result i32))) (type $1 (func (param f32 f32) (result f32))) (type $2 (func (param i64) (result i64))) - (memory $0 0) + (memory $0 0 notshared) (func $__Z12serveroptionPc (type $0) (result i32) (return (i32.const 0) diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt index 3ffe3b7bafb..2292bacb44c 100644 --- a/test/passes/duplicate-function-elimination.txt +++ b/test/passes/duplicate-function-elimination.txt @@ -1,13 +1,13 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (nop) ) ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (i32.const 0) @@ -19,7 +19,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (drop (i32.const 0) @@ -28,7 +28,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (i32.const 0) @@ -44,7 +44,7 @@ (type $0 (func)) (table 3 3 anyfunc) (elem (i32.const 0) $keep2 $keep2 $caller) - (memory $0 0) + (memory $0 0 notshared) (export "keep2" (func $keep2)) (export "other" (func $keep2)) (start $keep2) @@ -58,7 +58,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2-after-two-passes (type $0) (nop) ) @@ -68,7 +68,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep-4 (type $0) (nop) ) @@ -87,7 +87,7 @@ (type $S (func (result i32))) (type $2 (func)) (type $3 (func (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $keep4-similar-but-func-sig-differs (type $2) (drop (i32.const 0) @@ -108,7 +108,7 @@ (module (type $S (func (result i32))) (type $1 (func (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $keep2-similar-but-func-sig-differs (type $1) (param $i i32) (drop (i32.const 0) @@ -120,7 +120,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (nop) ) @@ -131,7 +131,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (block $block0 ) @@ -139,7 +139,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (block $block0 ) @@ -152,7 +152,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (block $block0 (nop) @@ -161,7 +161,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (block $block0 (nop) @@ -176,7 +176,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (block $block0 (nop) @@ -190,7 +190,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase-since-block-names-do-not-matter (type $0) (block $foo ) @@ -198,7 +198,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase-since-block-names-do-not-matter (type $0) (block $foo (br $foo) @@ -210,7 +210,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (block $foo (block $block @@ -234,7 +234,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (block $foo (br_if $foo @@ -252,7 +252,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (block $foo (br_if $foo @@ -263,7 +263,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (block $foo (br_table $foo $foo @@ -281,7 +281,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (loop $bar (nop) @@ -290,7 +290,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (block $foo (result i32) @@ -314,7 +314,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (block $foo (block $bar @@ -327,7 +327,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (block $foo (block $bar @@ -349,14 +349,14 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (call $erase) ) ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2-but-in-theory-we-could-erase (type $0) (call $keep2-but-in-theory-we-could-erase) ) @@ -368,7 +368,7 @@ (type $FUNCSIG$v (func)) (import "env" "i" (func $i)) (import "env" "j" (func $j)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $FUNCSIG$v) (call $i) ) @@ -377,7 +377,7 @@ (type $FUNCSIG$v (func)) (import "env" "i" (func $i)) (import "env" "j" (func $j)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $FUNCSIG$v) (call $i) ) @@ -389,7 +389,7 @@ (type $T (func)) (table 2 2 anyfunc) (elem (i32.const 0) $erase $erase) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $T) (call_indirect $T (i32.const 0) @@ -400,7 +400,7 @@ (type $T (func)) (table 2 2 anyfunc) (elem (i32.const 0) $keep2 $other) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $T) (call_indirect $T (i32.const 0) @@ -417,7 +417,7 @@ (type $S (func)) (table 2 2 anyfunc) (elem (i32.const 0) $keep2 $other) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $T) (call_indirect $T (i32.const 0) @@ -431,7 +431,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase-even-locals-with-different-names (type $0) (local $i i32) (drop @@ -441,7 +441,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (local $i i32) (drop @@ -457,7 +457,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase-even-locals-with-different-names (type $0) (local $i i32) (set_local $i @@ -467,7 +467,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (local $i i32) (set_local $i @@ -483,7 +483,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (local $i i32) (set_local $i @@ -499,7 +499,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $erase (type $0) (drop (i32.load @@ -515,7 +515,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (drop (i32.load offset=3 @@ -533,7 +533,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (drop (i32.load16_s offset=3 @@ -551,7 +551,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (drop (i32.load16_s @@ -569,7 +569,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (drop (i32.load16_s offset=3 @@ -587,7 +587,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (drop (i32.load16_u offset=3 @@ -605,7 +605,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $erase (type $0) (i32.store (i32.const 0) @@ -619,7 +619,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (i32.store offset=3 (i32.const 0) @@ -635,7 +635,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (i32.store16 offset=3 (i32.const 0) @@ -651,7 +651,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (i32.store16 (i32.const 0) @@ -667,7 +667,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (i32.store16 offset=3 (i32.const 0) @@ -683,7 +683,7 @@ ) (module (type $0 (func)) - (memory $0 10) + (memory $0 10 notshared) (func $keep2 (type $0) (i32.store16 offset=3 (i32.const 0) @@ -699,7 +699,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (i32.const 0) @@ -713,7 +713,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (i32.const 0) @@ -727,7 +727,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (i32.const 0) @@ -741,7 +741,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (i64.const 0) @@ -755,7 +755,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (f32.const 0.10000000149011612) @@ -769,7 +769,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (f64.const 0.1) @@ -783,7 +783,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (drop (f32.abs @@ -794,7 +794,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (f32.abs @@ -812,7 +812,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (f32.abs @@ -830,7 +830,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (drop (f32.add @@ -842,7 +842,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (f32.add @@ -862,7 +862,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (f32.add @@ -882,7 +882,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep2 (type $0) (drop (f32.add @@ -902,7 +902,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (drop (select @@ -915,7 +915,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep (type $0) (drop (select @@ -937,7 +937,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep (type $0) (drop (select @@ -959,7 +959,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep (type $0) (drop (select @@ -981,14 +981,14 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (return) ) ) (module (type $0 (func (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (result i32) (return (i32.const 0) @@ -997,7 +997,7 @@ ) (module (type $0 (func (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $keep (type $0) (result i32) (return (i32.const 0) @@ -1011,7 +1011,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (drop (current_memory) @@ -1020,7 +1020,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $erase (type $0) (drop (grow_memory @@ -1031,7 +1031,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep (type $0) (drop (grow_memory @@ -1049,7 +1049,7 @@ ) (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $keep (type $0) (drop (current_memory) diff --git a/test/passes/flatten-control-flow.bin.txt b/test/passes/flatten-control-flow.bin.txt index 9b33f976e21..1552c1ee49d 100644 --- a/test/passes/flatten-control-flow.bin.txt +++ b/test/passes/flatten-control-flow.bin.txt @@ -9,7 +9,7 @@ (type $7 (func (param f64) (result f64))) (type $8 (func (param i64 f32 f64 i32 i32))) (type $9 (func (param i64 f32 f64 i32 i32) (result f64))) - (memory $0 0) + (memory $0 0 notshared) (export "type-local-i32" (func $0)) (export "type-local-i64" (func $1)) (export "type-local-f32" (func $2)) diff --git a/test/passes/flatten-control-flow.txt b/test/passes/flatten-control-flow.txt index d94536712b3..f8cc5cf1c34 100644 --- a/test/passes/flatten-control-flow.txt +++ b/test/passes/flatten-control-flow.txt @@ -7,7 +7,7 @@ (global $x (mut i32) (i32.const 0)) (table 1 1 anyfunc) (elem (i32.const 0) $call-me) - (memory $0 10) + (memory $0 10 notshared) (func $call-me (type $ii) (param $0 i32) (param $1 i32) (nop) ) diff --git a/test/passes/inlining.txt b/test/passes/inlining.txt index 80ee3acf362..b1868358e89 100644 --- a/test/passes/inlining.txt +++ b/test/passes/inlining.txt @@ -5,7 +5,7 @@ (type $3 (func (param f32 i64))) (table 1 1 anyfunc) (elem (i32.const 0) $tabled) - (memory $0 0) + (memory $0 0 notshared) (export "user" (func $user)) (export "exported" (func $exported)) (func $user (type $0) diff --git a/test/passes/instrument-locals.txt b/test/passes/instrument-locals.txt index 5cc8a98fefc..0d6f260c8aa 100644 --- a/test/passes/instrument-locals.txt +++ b/test/passes/instrument-locals.txt @@ -12,7 +12,7 @@ (import "instrument" "set_i64" (func $set_i64 (param i32 i32 i64) (result i64))) (import "instrument" "set_f32" (func $set_f32 (param i32 i32 f32) (result f32))) (import "instrument" "set_f64" (func $set_f64 (param i32 i32 f64) (result f64))) - (memory $0 0) + (memory $0 0 notshared) (func $A (type $0) (local $x i32) (local $y i64) diff --git a/test/passes/instrument-memory.txt b/test/passes/instrument-memory.txt index dd2e876d0a7..d69a9de1487 100644 --- a/test/passes/instrument-memory.txt +++ b/test/passes/instrument-memory.txt @@ -3,7 +3,7 @@ (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32))) (import "instrument" "load" (func $load (param i32 i32 i32 i32) (result i32))) (import "instrument" "store" (func $store (param i32 i32 i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $A (type $1) (drop (i32.load8_s diff --git a/test/passes/local-cse.txt b/test/passes/local-cse.txt index 34e7c9580eb..4f27a965b09 100644 --- a/test/passes/local-cse.txt +++ b/test/passes/local-cse.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (param i32) (result i32))) - (memory $0 100 100) + (memory $0 100 100 notshared) (func $basics (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/local-cse_ignore-implicit-traps.txt b/test/passes/local-cse_ignore-implicit-traps.txt index 8ad60b8ade3..d8381f7c47b 100644 --- a/test/passes/local-cse_ignore-implicit-traps.txt +++ b/test/passes/local-cse_ignore-implicit-traps.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 100 100) + (memory $0 100 100 notshared) (func $loads (type $0) (local $0 i32) (drop diff --git a/test/passes/log-execution.txt b/test/passes/log-execution.txt index 32bbd88eb9c..572fee43fbe 100644 --- a/test/passes/log-execution.txt +++ b/test/passes/log-execution.txt @@ -3,7 +3,7 @@ (type $1 (func (result i32))) (type $FUNCSIG$vi (func (param i32))) (import "env" "log_execution" (func $log_execution (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $nopp (type $0) (call $log_execution (i32.const 0) diff --git a/test/passes/memory-packing.txt b/test/passes/memory-packing.txt index 6f67f9dcbdd..91c8b49196d 100644 --- a/test/passes/memory-packing.txt +++ b/test/passes/memory-packing.txt @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 2048 2048)) + (import "env" "memory" (memory $0 2048 2048 notshared)) (import "env" "memoryBase" (global $memoryBase i32)) (data (get_global $memoryBase) "waka this cannot be optimized\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00we don\'t know where it will go") (data (i32.const 1024) "waka this CAN be optimized") @@ -11,10 +11,10 @@ (data (i32.const 4066) "another\00but no") ) (module - (import "env" "memory" (memory $0 2048 2048)) + (import "env" "memory" (memory $0 2048 2048 notshared)) (import "env" "memoryBase" (global $memoryBase i32)) ) (module - (import "env" "memory" (memory $0 2048 2048)) + (import "env" "memory" (memory $0 2048 2048 notshared)) (import "env" "memoryBase" (global $memoryBase i32)) ) diff --git a/test/passes/merge-blocks.txt b/test/passes/merge-blocks.txt index 33f16785a82..18d08cc0b95 100644 --- a/test/passes/merge-blocks.txt +++ b/test/passes/merge-blocks.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $drop-block (type $0) (block $block (block $x diff --git a/test/passes/metrics.txt b/test/passes/metrics.txt index caf5f8a910d..3d0abd2162a 100644 --- a/test/passes/metrics.txt +++ b/test/passes/metrics.txt @@ -14,7 +14,7 @@ Counts (global $glob i32 (i32.const 1337)) (table 256 256 anyfunc) (elem (i32.const 0) $ifs $ifs $ifs) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 0) "\ff\ef\0f\1f 0@P\99") (func $ifs (type $0) (param $x i32) (local $y f32) @@ -61,5 +61,5 @@ Counts [total] : 0 [vars] : 0 (module - (memory $0 0) + (memory $0 0 notshared) ) diff --git a/test/passes/nm.txt b/test/passes/nm.txt index 22e67cd8c73..cd5346464df 100644 --- a/test/passes/nm.txt +++ b/test/passes/nm.txt @@ -3,7 +3,7 @@ $c : 13 (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $a (type $0) (nop) ) diff --git a/test/passes/optimize-instructions.txt b/test/passes/optimize-instructions.txt index c8fe17cf055..1cfd9eda648 100644 --- a/test/passes/optimize-instructions.txt +++ b/test/passes/optimize-instructions.txt @@ -6,7 +6,7 @@ (type $4 (func (param i32 i32))) (type $5 (func (param i32))) (type $6 (func (param i32 i32) (result i32))) - (memory $0 0) + (memory $0 0 notshared) (export "load-off-2" (func $load-off-2)) (func $f (type $0) (param $i1 i32) (param $i2 i64) (if diff --git a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt b/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt index e2c4bb786a6..b985fb071a2 100644 --- a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt +++ b/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $conditionals (type $0) (param $0 i32) (param $1 i32) (result i32) (local $2 i32) (local $3 i32) diff --git a/test/passes/pick-load-signs.txt b/test/passes/pick-load-signs.txt index e8507fa29ab..3859e7ffa46 100644 --- a/test/passes/pick-load-signs.txt +++ b/test/passes/pick-load-signs.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $a (type $0) (local $y i32) (set_local $y diff --git a/test/passes/post-emscripten.txt b/test/passes/post-emscripten.txt index 9473180519e..90744a267df 100644 --- a/test/passes/post-emscripten.txt +++ b/test/passes/post-emscripten.txt @@ -4,7 +4,7 @@ (type $2 (func (param i32) (result i32))) (type $3 (func)) (import "global.Math" "pow" (func $Math_pow (param f64 f64) (result f64))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "load-off-2" (func $load-off-2)) (func $b0 (type $0) (param $x i32) (drop diff --git a/test/passes/precompute.txt b/test/passes/precompute.txt index c0dd8df0a8f..28c51bdd78b 100644 --- a/test/passes/precompute.txt +++ b/test/passes/precompute.txt @@ -2,7 +2,7 @@ (type $0 (func (param i32))) (type $1 (func (result i32))) (type $2 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $x (type $0) (param $x i32) (call $x (i32.const 2300) diff --git a/test/passes/precompute_coalesce-locals_vacuum.txt b/test/passes/precompute_coalesce-locals_vacuum.txt index dbeec78f153..67ab08c5953 100644 --- a/test/passes/precompute_coalesce-locals_vacuum.txt +++ b/test/passes/precompute_coalesce-locals_vacuum.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32) (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $nested-br_if-value (type $0) (param $0 i32) (result i32) (loop $label$0 (br $label$0) diff --git a/test/passes/print-call-graph.txt b/test/passes/print-call-graph.txt index c1db051ade3..7cfc743e543 100644 --- a/test/passes/print-call-graph.txt +++ b/test/passes/print-call-graph.txt @@ -137,7 +137,7 @@ digraph call { (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32))) (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 9 9 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/passes/remove-imports.txt b/test/passes/remove-imports.txt index f195df7e7a1..ed6d357b29a 100644 --- a/test/passes/remove-imports.txt +++ b/test/passes/remove-imports.txt @@ -2,7 +2,7 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$d (func (result f64))) - (memory $0 1024 1024) + (memory $0 1024 1024 notshared) (func $nada (type $FUNCSIG$v) (nop) (drop diff --git a/test/passes/remove-memory.txt b/test/passes/remove-memory.txt index ee65d237e23..6f244de87ae 100644 --- a/test/passes/remove-memory.txt +++ b/test/passes/remove-memory.txt @@ -1,3 +1,3 @@ (module - (memory $0 1024 1024) + (memory $0 1024 1024 notshared) ) diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt index 62643ae00da..03a1b361b9d 100644 --- a/test/passes/remove-unused-brs.txt +++ b/test/passes/remove-unused-brs.txt @@ -4,7 +4,7 @@ (type $2 (func (result i32))) (type $3 (func (param i32 i32) (result i32))) (type $4 (func (param i32 i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $b0-yes (type $0) (param $i1 i32) (block $topmost ) diff --git a/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt b/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt index d2bc2ad9b5a..f97538c6e4f 100644 --- a/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt +++ b/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32) (result f64))) (global $global$3 (mut f64) (f64.const 0)) - (memory $0 0) + (memory $0 0 notshared) (func $1 (type $0) (param $x i32) (result f64) (local $var$0 f64) (block $label$0 (result f64) diff --git a/test/passes/remove-unused-brs_shrink-level=1.txt b/test/passes/remove-unused-brs_shrink-level=1.txt index 09e727ea579..70999fd2c95 100644 --- a/test/passes/remove-unused-brs_shrink-level=1.txt +++ b/test/passes/remove-unused-brs_shrink-level=1.txt @@ -2,7 +2,7 @@ (type $0 (func (param i32))) (type $1 (func)) (type $2 (func (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $b14 (type $2) (result i32) (drop (select diff --git a/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt b/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt index 06734897a4e..2311a8a00fa 100644 --- a/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt +++ b/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt @@ -2,7 +2,7 @@ (type $0 (func (param i32))) (type $1 (func)) (type $2 (func (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $b14 (type $2) (result i32) (drop (select diff --git a/test/passes/remove-unused-module-elements.txt b/test/passes/remove-unused-module-elements.txt index abce5a5aa70..0a74dabcc4c 100644 --- a/test/passes/remove-unused-module-elements.txt +++ b/test/passes/remove-unused-module-elements.txt @@ -4,7 +4,7 @@ (type $2 (func (param i32) (result i32))) (table 1 1 anyfunc) (elem (i32.const 0) $called_indirect) - (memory $0 0) + (memory $0 0 notshared) (export "memory" (memory $0)) (export "exported" (func $exported)) (export "other1" (func $other1)) @@ -80,12 +80,12 @@ ) ) (module - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) ) (module (type $0 (func)) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) @@ -104,7 +104,7 @@ (global $int (mut i32) (get_global $imported)) (global $set (mut i32) (i32.const 100)) (global $exp_glob i32 (i32.const 600)) - (memory $0 0) + (memory $0 0 notshared) (export "one" (func $one)) (export "three" (func $three)) (export "exp_glob" (global $exp_glob)) diff --git a/test/passes/remove-unused-names.txt b/test/passes/remove-unused-names.txt index 91b8b898193..c9c320842a9 100644 --- a/test/passes/remove-unused-names.txt +++ b/test/passes/remove-unused-names.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32) (result i32))) (type $1 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $b0 (type $0) (param $i1 i32) (result i32) (i32.const 0) ) diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt index ed448607dc7..6113f03ace7 100644 --- a/test/passes/remove-unused-names_merge-blocks.txt +++ b/test/passes/remove-unused-names_merge-blocks.txt @@ -6,7 +6,7 @@ (type $4 (func (result i32))) (table 1 1 anyfunc) (elem (i32.const 0) $call-i) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $call-i (type $i) (param $0 i32) (nop) ) diff --git a/test/passes/remove-unused-names_precompute.txt b/test/passes/remove-unused-names_precompute.txt index dccd4708e3b..498aa023e1f 100644 --- a/test/passes/remove-unused-names_precompute.txt +++ b/test/passes/remove-unused-names_precompute.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $__ZN10WasmAssertC2Ev__async_cb (type $0) (param $$0 i32) (block $switch-default (nop) diff --git a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt index d8ce1549186..b821f9017fe 100644 --- a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt +++ b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt @@ -52,7 +52,7 @@ (import "asm2wasm" "i32s-rem" (func $import$27 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-rem" (func $import$28 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $import$29 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256)) + (import "env" "memory" (memory $0 256 notshared)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $import$32 i32)) (import "env" "tableBase" (global $import$33 i32)) diff --git a/test/passes/remove-unused-names_vacuum.txt b/test/passes/remove-unused-names_vacuum.txt index 999d8915e0d..419f2bd3110 100644 --- a/test/passes/remove-unused-names_vacuum.txt +++ b/test/passes/remove-unused-names_vacuum.txt @@ -1,7 +1,7 @@ (module (type $0 (func (result i32))) (type $1 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $return-i32-but-body-is-unreachable3 (type $0) (result i32) (local $label i32) (unreachable) diff --git a/test/passes/reorder-functions.txt b/test/passes/reorder-functions.txt index 9af9c34f02d..d41275baadb 100644 --- a/test/passes/reorder-functions.txt +++ b/test/passes/reorder-functions.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $c (type $0) (call $c) (call $c) diff --git a/test/passes/reorder-locals.txt b/test/passes/reorder-locals.txt index 371a526884b..50fba030553 100644 --- a/test/passes/reorder-locals.txt +++ b/test/passes/reorder-locals.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32 i32))) (type $1 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $b0-yes (type $0) (param $a i32) (param $b i32) (local $z i32) (local $y i32) diff --git a/test/passes/rereloop.txt b/test/passes/rereloop.txt index 17a08439540..a0836b49f8d 100644 --- a/test/passes/rereloop.txt +++ b/test/passes/rereloop.txt @@ -3,7 +3,7 @@ (type $1 (func (result i32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $trivial (type $0) (local $0 i32) (block diff --git a/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt b/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt index 9a49f3891a4..3955479b9f2 100644 --- a/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt +++ b/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt @@ -3,7 +3,7 @@ (type $1 (func (result i32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32))) - (memory $0 0) + (memory $0 0 notshared) (func $trivial (type $0) (nop) ) diff --git a/test/passes/simplify-locals-nostructure.txt b/test/passes/simplify-locals-nostructure.txt index 2502c4549fd..c869b192d6d 100644 --- a/test/passes/simplify-locals-nostructure.txt +++ b/test/passes/simplify-locals-nostructure.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $contrast (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/simplify-locals-notee-nostructure.txt b/test/passes/simplify-locals-notee-nostructure.txt index 027566e4310..5722ecd28ed 100644 --- a/test/passes/simplify-locals-notee-nostructure.txt +++ b/test/passes/simplify-locals-notee-nostructure.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $contrast (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/simplify-locals-notee.txt b/test/passes/simplify-locals-notee.txt index 7677bfc6d23..e03c2f7c172 100644 --- a/test/passes/simplify-locals-notee.txt +++ b/test/passes/simplify-locals-notee.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $contrast (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt index 8c12c274ac2..e0455f7f2c5 100644 --- a/test/passes/simplify-locals.txt +++ b/test/passes/simplify-locals.txt @@ -14,7 +14,7 @@ (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32))) (import "env" "moddi" (func $___udivmoddi4 (param i32 i32 i32 i32 i32) (result i32))) (import "env" "lp" (func $lp (param i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $contrast (type $FUNCSIG$v) (local $x i32) (local $y i32) diff --git a/test/passes/ssa.txt b/test/passes/ssa.txt index d3f9140afec..4561c1aae94 100644 --- a/test/passes/ssa.txt +++ b/test/passes/ssa.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32))) (type $1 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $basics (type $0) (param $x i32) (local $y i32) (local $z f32) diff --git a/test/passes/untee.txt b/test/passes/untee.txt index f174da801a6..c8aea067102 100644 --- a/test/passes/untee.txt +++ b/test/passes/untee.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $tee (type $0) (local $x i32) (local $y f64) diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt index d1a388333b2..971c08fd18f 100644 --- a/test/passes/vacuum.txt +++ b/test/passes/vacuum.txt @@ -7,7 +7,7 @@ (type $FUNCSIG$i (func (result i32))) (import "env" "int" (func $int (result i32))) (global $Int i32 (i32.const 0)) - (memory $0 256 256) + (memory $0 256 256 notshared) (func $b (type $0) (nop) ) diff --git a/test/passes/vacuum_remove-unused-names_merge-blocks.txt b/test/passes/vacuum_remove-unused-names_merge-blocks.txt index c62581bc29e..06232526ee2 100644 --- a/test/passes/vacuum_remove-unused-names_merge-blocks.txt +++ b/test/passes/vacuum_remove-unused-names_merge-blocks.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32) (result i32))) - (memory $0 0) + (memory $0 0 notshared) (func $return-block (type $0) (param $x i32) (result i32) (set_local $x (get_local $x) diff --git a/test/reg_switch.wast.from-wast b/test/reg_switch.wast.from-wast index a766908048b..f1b67c6a04d 100644 --- a/test/reg_switch.wast.from-wast +++ b/test/reg_switch.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $0 (type $0) (if (i32.const 0) diff --git a/test/reg_switch.wast.fromBinary b/test/reg_switch.wast.fromBinary index e68e8c153e8..a24a88c4e31 100644 --- a/test/reg_switch.wast.fromBinary +++ b/test/reg_switch.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $0 (type $0) (if (i32.const 0) diff --git a/test/reg_switch.wast.fromBinary.noDebugInfo b/test/reg_switch.wast.fromBinary.noDebugInfo index e68e8c153e8..a24a88c4e31 100644 --- a/test/reg_switch.wast.fromBinary.noDebugInfo +++ b/test/reg_switch.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0) + (memory $0 0 notshared) (func $0 (type $0) (if (i32.const 0) diff --git a/test/spec b/test/spec index 668281b3d7d..db60b99bd36 160000 --- a/test/spec +++ b/test/spec @@ -1 +1 @@ -Subproject commit 668281b3d7dfe9be6cbc3c4500b537c49d6449b9 +Subproject commit db60b99bd3693e0ae87ff5b03afa4010ecb0d439 diff --git a/test/stacky.wasm.fromBinary b/test/stacky.wasm.fromBinary index 375e216a2a6..9f993692929 100644 --- a/test/stacky.wasm.fromBinary +++ b/test/stacky.wasm.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256) + (memory $0 256 256 notshared) (export "add" (func $0)) (func $0 (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (local $2 i32) diff --git a/test/table-import.wast.from-wast b/test/table-import.wast.from-wast index 4bf63ed8d83..8d3d6f77adb 100644 --- a/test/table-import.wast.from-wast +++ b/test/table-import.wast.from-wast @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "table" (table 1 1 anyfunc)) (elem (i32.const 0) $foo) - (memory $0 0) + (memory $0 0 notshared) (func $foo (type $0) (nop) ) diff --git a/test/table-import.wast.fromBinary b/test/table-import.wast.fromBinary index cfdbc8a43e9..f6a40195ef6 100644 --- a/test/table-import.wast.fromBinary +++ b/test/table-import.wast.fromBinary @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "table" (table 1 1 anyfunc)) (elem (i32.const 0) $foo) - (memory $0 0) + (memory $0 0 notshared) (func $foo (type $0) (nop) ) diff --git a/test/table-import.wast.fromBinary.noDebugInfo b/test/table-import.wast.fromBinary.noDebugInfo index b45ca4a7d29..7eeb77595a6 100644 --- a/test/table-import.wast.fromBinary.noDebugInfo +++ b/test/table-import.wast.fromBinary.noDebugInfo @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "table" (table 1 1 anyfunc)) (elem (i32.const 0) $0) - (memory $0 0) + (memory $0 0 notshared) (func $0 (type $0) (nop) ) diff --git a/test/two_sides.fromasm b/test/two_sides.fromasm index f79a0dd07e6..4484d3dffd8 100644 --- a/test/two_sides.fromasm +++ b/test/two_sides.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$id (func (param f64) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.clamp b/test/two_sides.fromasm.clamp index 8329325d199..0e03b04b220 100644 --- a/test/two_sides.fromasm.clamp +++ b/test/two_sides.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.clamp.no-opts b/test/two_sides.fromasm.clamp.no-opts index 8ce7ab86cd5..1c22bc8a4c6 100644 --- a/test/two_sides.fromasm.clamp.no-opts +++ b/test/two_sides.fromasm.clamp.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.imprecise b/test/two_sides.fromasm.imprecise index 9b486c29ce4..5a34dd49b4f 100644 --- a/test/two_sides.fromasm.imprecise +++ b/test/two_sides.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.imprecise.no-opts b/test/two_sides.fromasm.imprecise.no-opts index aeaffb79dab..085b028d809 100644 --- a/test/two_sides.fromasm.imprecise.no-opts +++ b/test/two_sides.fromasm.imprecise.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.no-opts b/test/two_sides.fromasm.no-opts index caa03418bbe..1fc4bf86dd4 100644 --- a/test/two_sides.fromasm.no-opts +++ b/test/two_sides.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$id (func (param f64) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm b/test/unit.fromasm index c869e2398c2..61a9bf18c7e 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -16,7 +16,7 @@ (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.clamp b/test/unit.fromasm.clamp index 370e66c4d14..c499b03c54a 100644 --- a/test/unit.fromasm.clamp +++ b/test/unit.fromasm.clamp @@ -14,7 +14,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.clamp.no-opts b/test/unit.fromasm.clamp.no-opts index 8ff26568ee3..4278e602451 100644 --- a/test/unit.fromasm.clamp.no-opts +++ b/test/unit.fromasm.clamp.no-opts @@ -18,7 +18,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index 45912cffb7c..067e64e57cb 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -14,7 +14,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts index 3747f2c9010..289fb13f334 100644 --- a/test/unit.fromasm.imprecise.no-opts +++ b/test/unit.fromasm.imprecise.no-opts @@ -18,7 +18,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts index dba91cfcd2f..7183a348660 100644 --- a/test/unit.fromasm.no-opts +++ b/test/unit.fromasm.no-opts @@ -20,7 +20,7 @@ (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.wast.from-wast b/test/unit.wast.from-wast index bb66845af0a..389a2535452 100644 --- a/test/unit.wast.from-wast +++ b/test/unit.wast.from-wast @@ -14,7 +14,7 @@ (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) (table 10 anyfunc) (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) - (memory $0 4096 4096) + (memory $0 4096 4096 notshared) (data (i32.const 1026) "\14\00") (export "big_negative" (func $big_negative)) (func $big_negative (type $FUNCSIG$v) diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary index 7656dc7d78f..e297fa68602 100644 --- a/test/unit.wast.fromBinary +++ b/test/unit.wast.fromBinary @@ -14,7 +14,7 @@ (import "asm2wasm" "f64-rem" (func $import$2 (param f64 f64) (result f64))) (table 10 anyfunc) (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) - (memory $0 4096 4096) + (memory $0 4096 4096 notshared) (data (i32.const 1026) "\14\00") (export "big_negative" (func $big_negative)) (func $big_negative (type $1) diff --git a/test/unit.wast.fromBinary.noDebugInfo b/test/unit.wast.fromBinary.noDebugInfo index bfcc12c6b6f..aefa0a8340c 100644 --- a/test/unit.wast.fromBinary.noDebugInfo +++ b/test/unit.wast.fromBinary.noDebugInfo @@ -14,7 +14,7 @@ (import "asm2wasm" "f64-rem" (func $import$2 (param f64 f64) (result f64))) (table 10 anyfunc) (elem (i32.const 0) $17 $0 $17 $17 $18 $18 $1 $18 $17 $15) - (memory $0 4096 4096) + (memory $0 4096 4096 notshared) (data (i32.const 1026) "\14\00") (export "big_negative" (func $0)) (func $0 (type $1) diff --git a/test/unreachable-import_wasm-only.fromasm b/test/unreachable-import_wasm-only.fromasm index b6398918838..710923cc094 100644 --- a/test/unreachable-import_wasm-only.fromasm +++ b/test/unreachable-import_wasm-only.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.clamp b/test/unreachable-import_wasm-only.fromasm.clamp index b6398918838..710923cc094 100644 --- a/test/unreachable-import_wasm-only.fromasm.clamp +++ b/test/unreachable-import_wasm-only.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.clamp.no-opts b/test/unreachable-import_wasm-only.fromasm.clamp.no-opts index af8c60715b8..ece7589734f 100644 --- a/test/unreachable-import_wasm-only.fromasm.clamp.no-opts +++ b/test/unreachable-import_wasm-only.fromasm.clamp.no-opts @@ -14,7 +14,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "___cxa_allocate_exception" (func $___cxa_allocate_exception (param i32) (result i32))) (import "env" "___cxa_throw" (func $___cxa_throw (param i32 i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.imprecise b/test/unreachable-import_wasm-only.fromasm.imprecise index 208c4435e5e..01030ee09c3 100644 --- a/test/unreachable-import_wasm-only.fromasm.imprecise +++ b/test/unreachable-import_wasm-only.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts b/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts index af8c60715b8..ece7589734f 100644 --- a/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts +++ b/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts @@ -14,7 +14,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "___cxa_allocate_exception" (func $___cxa_allocate_exception (param i32) (result i32))) (import "env" "___cxa_throw" (func $___cxa_throw (param i32 i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.no-opts b/test/unreachable-import_wasm-only.fromasm.no-opts index af8c60715b8..ece7589734f 100644 --- a/test/unreachable-import_wasm-only.fromasm.no-opts +++ b/test/unreachable-import_wasm-only.fromasm.no-opts @@ -14,7 +14,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "___cxa_allocate_exception" (func $___cxa_allocate_exception (param i32) (result i32))) (import "env" "___cxa_throw" (func $___cxa_throw (param i32 i32 i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm b/test/use-import-and-drop.fromasm index 5b42aff4aac..37439644a17 100644 --- a/test/use-import-and-drop.fromasm +++ b/test/use-import-and-drop.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.clamp b/test/use-import-and-drop.fromasm.clamp index 5b42aff4aac..37439644a17 100644 --- a/test/use-import-and-drop.fromasm.clamp +++ b/test/use-import-and-drop.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.clamp.no-opts b/test/use-import-and-drop.fromasm.clamp.no-opts index 332851f6143..88445c9dace 100644 --- a/test/use-import-and-drop.fromasm.clamp.no-opts +++ b/test/use-import-and-drop.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.imprecise b/test/use-import-and-drop.fromasm.imprecise index ddb433043ea..8c0fb002264 100644 --- a/test/use-import-and-drop.fromasm.imprecise +++ b/test/use-import-and-drop.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.imprecise.no-opts b/test/use-import-and-drop.fromasm.imprecise.no-opts index 332851f6143..88445c9dace 100644 --- a/test/use-import-and-drop.fromasm.imprecise.no-opts +++ b/test/use-import-and-drop.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.no-opts b/test/use-import-and-drop.fromasm.no-opts index 332851f6143..88445c9dace 100644 --- a/test/use-import-and-drop.fromasm.no-opts +++ b/test/use-import-and-drop.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm b/test/wasm-only.fromasm index f12226b1dcf..3903254dcef 100644 --- a/test/wasm-only.fromasm +++ b/test/wasm-only.fromasm @@ -14,7 +14,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.clamp b/test/wasm-only.fromasm.clamp index f12226b1dcf..3903254dcef 100644 --- a/test/wasm-only.fromasm.clamp +++ b/test/wasm-only.fromasm.clamp @@ -14,7 +14,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.clamp.no-opts b/test/wasm-only.fromasm.clamp.no-opts index baac47fba2f..3c5be464bd0 100644 --- a/test/wasm-only.fromasm.clamp.no-opts +++ b/test/wasm-only.fromasm.clamp.no-opts @@ -15,7 +15,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.imprecise b/test/wasm-only.fromasm.imprecise index e05da979947..59bf79a6e7e 100644 --- a/test/wasm-only.fromasm.imprecise +++ b/test/wasm-only.fromasm.imprecise @@ -14,7 +14,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.imprecise.no-opts b/test/wasm-only.fromasm.imprecise.no-opts index 8c49b41d557..6ad896ef8e9 100644 --- a/test/wasm-only.fromasm.imprecise.no-opts +++ b/test/wasm-only.fromasm.imprecise.no-opts @@ -15,7 +15,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.no-opts b/test/wasm-only.fromasm.no-opts index baac47fba2f..3c5be464bd0 100644 --- a/test/wasm-only.fromasm.no-opts +++ b/test/wasm-only.fromasm.no-opts @@ -15,7 +15,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256)) + (import "env" "memory" (memory $0 256 256 notshared)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) From 9231f58408cdd54817fd5cfedf597054d971b830 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 22 Jun 2017 14:04:12 -0700 Subject: [PATCH 02/11] Fix import parsing too --- src/wasm-s-parser.h | 1 + src/wasm/wasm-s-parser.cpp | 40 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index 8b887d690d7..c79e0a458fe 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -196,6 +196,7 @@ class SExpressionWasmBuilder { Expression* makeReturn(Element& s); WasmType parseOptionalResultType(Element& s, Index& i); + Index parseMemoryLimits(Element& s, Index i); void stringToBinary(const char* input, size_t size, std::vector& data); void parseMemory(Element& s, bool preParseImport = false); diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp index c6915cad790..6bf030302b5 100644 --- a/src/wasm/wasm-s-parser.cpp +++ b/src/wasm/wasm-s-parser.cpp @@ -1440,6 +1440,23 @@ void SExpressionWasmBuilder::stringToBinary(const char* input, size_t size, std: data.resize(actual); } +Index SExpressionWasmBuilder::parseMemoryLimits(Element& s, Index i) { + wasm.memory.initial = getCheckedAddress(s[i++], "excessive memory init"); + if (i == s.size()) return i; + while (i < s.size() && s[i]->isStr()) { + auto* curr = s[i]->c_str(); + i++; + if (strstr(curr, "shared")) { + wasm.memory.shared = strncmp(curr, "notshared", 9) != 0; + break; + } + uint64_t max = atoll(curr); + if (max > Memory::kMaxSize) throw ParseException("total memory must be <= 4GB"); + wasm.memory.max = max; + } + return i; +} + void SExpressionWasmBuilder::parseMemory(Element& s, bool preParseImport) { if (wasm.memory.exists) throw ParseException("too many memories"); wasm.memory.exists = true; @@ -1479,20 +1496,8 @@ void SExpressionWasmBuilder::parseMemory(Element& s, bool preParseImport) { return; } } - wasm.memory.initial = getCheckedAddress(s[i++], "excessive memory init"); - if (i == s.size()) return; - // Parse memory limits. - while (i < s.size() && s[i]->isStr()) { - auto* curr = s[i]->c_str(); - i++; - if (strstr(curr, "shared")) { - wasm.memory.shared = strncmp(curr, "notshared", 9) != 0; - break; - } - uint64_t max = atoll(curr); - if (max > Memory::kMaxSize) throw ParseException("total memory must be <= 4GB"); - wasm.memory.max = max; - } + i = parseMemoryLimits(s, i); + // Parse memory initializers. while (i < s.size()) { Element& curr = *s[i]; @@ -1691,12 +1696,7 @@ void SExpressionWasmBuilder::parseImport(Element& s) { } // ends with the table element type } else if (im->kind == ExternalKind::Memory) { - if (j < inner.size()) { - wasm.memory.initial = getCheckedAddress(inner[j++], "excessive memory init size"); - } - if (j < inner.size()) { - wasm.memory.max = getCheckedAddress(inner[j++], "excessive memory max size"); - } + j = parseMemoryLimits(inner, j); } if (wasm.getImportOrNull(im->name)) throw ParseException("duplicate import", s.line, s.col); wasm.addImport(im.release()); From 6025dedc949badea2089ab5f1b10d683356a624e Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 22 Jun 2017 15:15:24 -0700 Subject: [PATCH 03/11] update spec --- test/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec b/test/spec index db60b99bd36..668281b3d7d 160000 --- a/test/spec +++ b/test/spec @@ -1 +1 @@ -Subproject commit db60b99bd3693e0ae87ff5b03afa4010ecb0d439 +Subproject commit 668281b3d7dfe9be6cbc3c4500b537c49d6449b9 From 7bd8e6cb6a67f89d5d675ecd31252b1fd30a5633 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 23 Jun 2017 11:21:11 -0700 Subject: [PATCH 04/11] fix test updater, auto-update tests --- auto_update_tests.py | 28 ++++++++++++---------- scripts/test/s2wasm.py | 2 +- test/ctor-eval/bad-indirect-call.wast.out | 2 +- test/ctor-eval/bad-indirect-call2.wast.out | 2 +- test/ctor-eval/basics-flatten.wast.out | 2 +- test/ctor-eval/basics.wast.out | 2 +- test/ctor-eval/imported-min.wast.out | 2 +- test/ctor-eval/imported.wast.out | 2 +- test/ctor-eval/imported2.wast.out | 2 +- test/ctor-eval/imported3.wast.out | 2 +- test/ctor-eval/indirect-call3.wast.out | 2 +- test/ctor-eval/just_some.wast.out | 2 +- test/ctor-eval/no_partial.wast.out | 2 +- test/ctor-eval/unsafe_call.wast.out | 2 +- test/ctor-eval/unsafe_store.wast.out | 2 +- test/ctor-eval/unsafe_store2.wast.out | 2 +- test/ctor-eval/unsafe_store3.wast.out | 2 +- test/fib-dbg.wasm.fromBinary | 9 +++++++ 18 files changed, 40 insertions(+), 29 deletions(-) diff --git a/auto_update_tests.py b/auto_update_tests.py index 76c7b4cf987..9ec77b8e7f0 100755 --- a/auto_update_tests.py +++ b/auto_update_tests.py @@ -4,7 +4,7 @@ from scripts.test.support import run_command, split_wast from scripts.test.shared import ( - ASM2WASM, S2WASM, WASM_SHELL, WASM_OPT, WASM_AS, WASM_DIS, WASM_CTOR_EVAL) + ASM2WASM, MOZJS, S2WASM, WASM_SHELL, WASM_OPT, WASM_AS, WASM_DIS, WASM_CTOR_EVAL) print '[ processing and updating testcases... ]\n' @@ -198,6 +198,7 @@ print '..', t t = os.path.join('test', t) cmd = WASM_DIS + [t] + if os.path.isfile(t + '.map'): cmd += ['--source-map', t + '.map'] actual = run_command(cmd) open(t + '.fromBinary', 'w').write(actual) @@ -222,18 +223,19 @@ with open(out, 'w') as o: o.write(actual) with open(out + '.stdout', 'w') as o: o.write(stdout) -print '\n[ checking binaryen.js testcases... ]\n' - -for s in sorted(os.listdir(os.path.join('test', 'binaryen.js'))): - if not s.endswith('.js'): continue - print s - f = open('a.js', 'w') - f.write(open(os.path.join('bin', 'binaryen.js')).read()) - f.write(open(os.path.join('test', 'binaryen.js', s)).read()) - f.close() - cmd = ['mozjs', 'a.js'] - out = run_command(cmd, stderr=subprocess.STDOUT) - open(os.path.join('test', 'binaryen.js', s + '.txt'), 'w').write(out) +if MOZJS: + print '\n[ checking binaryen.js testcases... ]\n' + + for s in sorted(os.listdir(os.path.join('test', 'binaryen.js'))): + if not s.endswith('.js'): continue + print s + f = open('a.js', 'w') + f.write(open(os.path.join('bin', 'binaryen.js')).read()) + f.write(open(os.path.join('test', 'binaryen.js', s)).read()) + f.close() + cmd = ['mozjs', 'a.js'] + out = run_command(cmd, stderr=subprocess.STDOUT) + open(os.path.join('test', 'binaryen.js', s + '.txt'), 'w').write(out) print '\n[ checking wasm-ctor-eval... ]\n' diff --git a/scripts/test/s2wasm.py b/scripts/test/s2wasm.py index e89a650994b..eb07a5e7eb6 100755 --- a/scripts/test/s2wasm.py +++ b/scripts/test/s2wasm.py @@ -29,7 +29,7 @@ def test_s2wasm(): os.path.join(options.binaryen_test, 'dot_s', 'basics.s'), '--import-memory'] output = run_command(cmd) - fail_if_not_contained(output, '(import "env" "memory" (memory $0 1))') + fail_if_not_contained(output, '(import "env" "memory" (memory $0 1 notshared))') for dot_s_dir in ['dot_s', 'llvm_autogenerated']: dot_s_path = os.path.join(options.binaryen_test, dot_s_dir) diff --git a/test/ctor-eval/bad-indirect-call.wast.out b/test/ctor-eval/bad-indirect-call.wast.out index fc3d71e42ad..5baadddeb12 100644 --- a/test/ctor-eval/bad-indirect-call.wast.out +++ b/test/ctor-eval/bad-indirect-call.wast.out @@ -2,7 +2,7 @@ (type $v (func)) (table 1 1 anyfunc) (elem (i32.const 0) $call-indirect) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (func $test1 (type $v) diff --git a/test/ctor-eval/bad-indirect-call2.wast.out b/test/ctor-eval/bad-indirect-call2.wast.out index d63f1a11e87..bfb96512181 100644 --- a/test/ctor-eval/bad-indirect-call2.wast.out +++ b/test/ctor-eval/bad-indirect-call2.wast.out @@ -4,7 +4,7 @@ (import "env" "_abort" (func $_abort)) (table 2 2 anyfunc) (elem (i32.const 0) $_abort $call-indirect) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (func $test1 (type $v) diff --git a/test/ctor-eval/basics-flatten.wast.out b/test/ctor-eval/basics-flatten.wast.out index 2c0502ab714..c29bae561cf 100644 --- a/test/ctor-eval/basics-flatten.wast.out +++ b/test/ctor-eval/basics-flatten.wast.out @@ -2,7 +2,7 @@ (type $v (func)) (table 1 1 anyfunc) (elem (i32.const 0) $call-indirect) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "nas\00\00\00aka\00yzkx waka wakm\00\00\00\00\00\00C") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/basics.wast.out b/test/ctor-eval/basics.wast.out index 4e541385b14..e0efdca9779 100644 --- a/test/ctor-eval/basics.wast.out +++ b/test/ctor-eval/basics.wast.out @@ -2,7 +2,7 @@ (type $v (func)) (table 1 1 anyfunc) (elem (i32.const 0) $call-indirect) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "nas\00\00\00aka yzkx waka wakm\00\00\00\00\00\00C") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported-min.wast.out b/test/ctor-eval/imported-min.wast.out index 48d4c5796a0..4172d5fcf80 100644 --- a/test/ctor-eval/imported-min.wast.out +++ b/test/ctor-eval/imported-min.wast.out @@ -7,7 +7,7 @@ (global $global0 (mut i32) (get_global $STACKTOP$asm2wasm$import)) (global $global1 (mut i32) (get_global $STACK_MAX$asm2wasm$import)) (global $do-not-use (mut i32) (get_global $tempDoublePtr)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported.wast.out b/test/ctor-eval/imported.wast.out index 38fcb184218..9965dc1692b 100644 --- a/test/ctor-eval/imported.wast.out +++ b/test/ctor-eval/imported.wast.out @@ -7,7 +7,7 @@ (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) (global $do-not-use (mut i32) (get_global $tempDoublePtr)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported2.wast.out b/test/ctor-eval/imported2.wast.out index 26b91cc3590..8ebd208353a 100644 --- a/test/ctor-eval/imported2.wast.out +++ b/test/ctor-eval/imported2.wast.out @@ -4,7 +4,7 @@ (import "env" "STACK_MAX" (global $STACK_MAX i32)) (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) (global $mine (mut i32) (i32.const 1)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported3.wast.out b/test/ctor-eval/imported3.wast.out index 6d8fab86718..5d88b8a6509 100644 --- a/test/ctor-eval/imported3.wast.out +++ b/test/ctor-eval/imported3.wast.out @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) (global $mine (mut i32) (get_global $tempDoublePtr)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/indirect-call3.wast.out b/test/ctor-eval/indirect-call3.wast.out index 27f661c3091..cca3fc7ef7e 100644 --- a/test/ctor-eval/indirect-call3.wast.out +++ b/test/ctor-eval/indirect-call3.wast.out @@ -5,7 +5,7 @@ (import "env" "_abort" (func $_abort)) (table 2 2 anyfunc) (elem (get_global $tableBase) $_abort $call-indirect) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C") (export "test1" (func $test1)) (func $test1 (type $v) diff --git a/test/ctor-eval/just_some.wast.out b/test/ctor-eval/just_some.wast.out index 79bb19df6fd..96f332a2d72 100644 --- a/test/ctor-eval/just_some.wast.out +++ b/test/ctor-eval/just_some.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/no_partial.wast.out b/test/ctor-eval/no_partial.wast.out index 0caa401d4a1..f79de10f3c3 100644 --- a/test/ctor-eval/no_partial.wast.out +++ b/test/ctor-eval/no_partial.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (func $test1 (type $0) diff --git a/test/ctor-eval/unsafe_call.wast.out b/test/ctor-eval/unsafe_call.wast.out index 7d88676102d..59a9e985c7c 100644 --- a/test/ctor-eval/unsafe_call.wast.out +++ b/test/ctor-eval/unsafe_call.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/unsafe_store.wast.out b/test/ctor-eval/unsafe_store.wast.out index 7fa97d87662..46466a41966 100644 --- a/test/ctor-eval/unsafe_store.wast.out +++ b/test/ctor-eval/unsafe_store.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 9) "mwaka waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/unsafe_store2.wast.out b/test/ctor-eval/unsafe_store2.wast.out index 7af56749aa1..75639c2a8ff 100644 --- a/test/ctor-eval/unsafe_store2.wast.out +++ b/test/ctor-eval/unsafe_store2.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka waka waka wakam") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/unsafe_store3.wast.out b/test/ctor-eval/unsafe_store3.wast.out index cbf66c6da82..4484f786193 100644 --- a/test/ctor-eval/unsafe_store3.wast.out +++ b/test/ctor-eval/unsafe_store3.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256) + (memory $0 256 256 notshared) (data (i32.const 10) "waka waka waka waka wakm") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary index 459612d2654..412f4641eaf 100644 --- a/test/fib-dbg.wasm.fromBinary +++ b/test/fib-dbg.wasm.fromBinary @@ -124,17 +124,21 @@ (local $var$9 i32) (local $var$10 i32) (local $var$11 i32) + ;;@ fib.c:8:0 (block $label$0 (set_local $var$11 (get_global $global$3) ) + ;;@ fib.c:3:0 (set_local $var$6 (i32.gt_s (get_local $var$0) (i32.const 0) ) ) + ;;@ fib.c:8:0 (if + ;;@ fib.c:3:0 (get_local $var$6) (block $label$1 (set_local $var$1 @@ -151,19 +155,23 @@ (set_local $var$4 (i32.const 1) ) + ;;@ fib.c:8:0 (return (get_local $var$4) ) ) ) + ;;@ fib.c:3:0 (loop $label$3 (block $label$4 + ;;@ fib.c:4:0 (set_local $var$3 (i32.add (get_local $var$5) (get_local $var$1) ) ) + ;;@ fib.c:3:0 (set_local $var$9 (i32.add (get_local $var$8) @@ -202,6 +210,7 @@ (br $label$3) ) ) + ;;@ fib.c:8:0 (return (get_local $var$4) ) From 4091253e5e77d8ae6b0958638e5c94d5a15cdc38 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 23 Jun 2017 14:43:33 -0700 Subject: [PATCH 05/11] fix flake8 --- scripts/test/s2wasm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/test/s2wasm.py b/scripts/test/s2wasm.py index eb07a5e7eb6..26a22400242 100755 --- a/scripts/test/s2wasm.py +++ b/scripts/test/s2wasm.py @@ -29,7 +29,8 @@ def test_s2wasm(): os.path.join(options.binaryen_test, 'dot_s', 'basics.s'), '--import-memory'] output = run_command(cmd) - fail_if_not_contained(output, '(import "env" "memory" (memory $0 1 notshared))') + fail_if_not_contained( + output, '(import "env" "memory" (memory $0 1 notshared))') for dot_s_dir in ['dot_s', 'llvm_autogenerated']: dot_s_path = os.path.join(options.binaryen_test, dot_s_dir) From 302c6daed4eeb5fa9db8c4ef1b5e8c516d960e9c Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Mon, 26 Jun 2017 17:10:34 -0700 Subject: [PATCH 06/11] dont print notshared, add tests --- scripts/test/s2wasm.py | 2 +- src/passes/Print.cpp | 4 +- test/break-to-return.wasm.fromBinary | 2 +- test/ctor-eval/bad-indirect-call.wast.out | 2 +- test/ctor-eval/bad-indirect-call2.wast.out | 2 +- test/ctor-eval/basics-flatten.wast.out | 2 +- test/ctor-eval/basics.wast.out | 2 +- test/ctor-eval/imported-min.wast.out | 2 +- test/ctor-eval/imported.wast.out | 2 +- test/ctor-eval/imported2.wast.out | 2 +- test/ctor-eval/imported3.wast.out | 2 +- test/ctor-eval/indirect-call3.wast.out | 2 +- test/ctor-eval/just_some.wast.out | 2 +- test/ctor-eval/no_partial.wast.out | 2 +- test/ctor-eval/unsafe_call.wast.out | 2 +- test/ctor-eval/unsafe_store.wast.out | 2 +- test/ctor-eval/unsafe_store2.wast.out | 2 +- test/ctor-eval/unsafe_store3.wast.out | 2 +- test/debugInfo.fromasm | 2 +- test/debugInfo.fromasm.clamp | 2 +- test/debugInfo.fromasm.clamp.no-opts | 2 +- test/debugInfo.fromasm.imprecise | 2 +- test/debugInfo.fromasm.imprecise.no-opts | 2 +- test/debugInfo.fromasm.no-opts | 2 +- test/dot_s/alias.wast | 2 +- test/dot_s/alternate-lcomm.wast | 2 +- test/dot_s/asm_const.wast | 2 +- test/dot_s/basics.wast | 2 +- test/dot_s/bcp-1.wast | 2 +- test/dot_s/data-offset-folding.wast | 2 +- test/dot_s/debug.wast | 2 +- test/dot_s/dso_handle.wast | 2 +- test/dot_s/dyncall.wast | 2 +- test/dot_s/exit.wast | 2 +- test/dot_s/export_malloc_free.wast | 2 +- test/dot_s/fix_em_ehsjlj_names.wast | 2 +- test/dot_s/function-data-sections.wast | 2 +- test/dot_s/globals.wast | 2 +- test/dot_s/hostFinalize.wast | 2 +- test/dot_s/indidx.wast | 2 +- test/dot_s/indirect-import.wast | 2 +- test/dot_s/initializers.wast | 2 +- test/dot_s/lcomm-in-text-segment.wast | 2 +- test/dot_s/local_align.wast | 2 +- test/dot_s/macClangMetaData.wast | 2 +- test/dot_s/memops.wast | 2 +- test/dot_s/minimal.wast | 2 +- test/dot_s/permute.wast | 2 +- test/dot_s/relocation.wast | 2 +- test/dot_s/return.wast | 2 +- test/dot_s/start_main0.wast | 2 +- test/dot_s/start_main2.wast | 2 +- test/dot_s/symbolic-offset.wast | 2 +- test/dot_s/text_before_type.wast | 2 +- test/dot_s/unreachable_blocks.wast | 2 +- test/dot_s/visibilities.wast | 2 +- test/dylib.wasm.fromBinary | 2 +- test/dynamicLibrary.fromasm | 2 +- test/dynamicLibrary.fromasm.clamp | 2 +- test/dynamicLibrary.fromasm.clamp.no-opts | 2 +- test/dynamicLibrary.fromasm.imprecise | 2 +- test/dynamicLibrary.fromasm.imprecise.no-opts | 2 +- test/dynamicLibrary.fromasm.no-opts | 2 +- test/emcc_O2_hello_world.fromasm | 2 +- test/emcc_O2_hello_world.fromasm.clamp | 2 +- .../emcc_O2_hello_world.fromasm.clamp.no-opts | 2 +- test/emcc_O2_hello_world.fromasm.imprecise | 2 +- ...c_O2_hello_world.fromasm.imprecise.no-opts | 2 +- test/emcc_O2_hello_world.fromasm.no-opts | 2 +- test/emcc_hello_world.fromasm | 2 +- test/emcc_hello_world.fromasm.clamp | 2 +- test/emcc_hello_world.fromasm.clamp.no-opts | 2 +- test/emcc_hello_world.fromasm.imprecise | 2 +- ...emcc_hello_world.fromasm.imprecise.no-opts | 2 +- test/emcc_hello_world.fromasm.no-opts | 2 +- test/empty.fromasm | 2 +- test/empty.fromasm.clamp | 2 +- test/empty.fromasm.clamp.no-opts | 2 +- test/empty.fromasm.imprecise | 2 +- test/empty.fromasm.imprecise.no-opts | 2 +- test/empty.fromasm.no-opts | 2 +- test/empty_imported_table.wast.from-wast | 2 +- test/empty_imported_table.wast.fromBinary | 2 +- ...imported_table.wast.fromBinary.noDebugInfo | 2 +- test/empty_table.wast.from-wast | 2 +- test/empty_table.wast.fromBinary | 2 +- test/empty_table.wast.fromBinary.noDebugInfo | 2 +- test/example/c-api-hello-world.txt | 2 +- test/example/c-api-kitchen-sink.txt | 18 +-- test/example/c-api-kitchen-sink.txt.txt | 6 +- test/example/c-api-unused-mem.txt | 4 +- test/example/relooper-fuzz.txt | 4 +- test/example/relooper-fuzz1.txt | 4 +- test/fib-dbg.wasm.fromBinary | 2 +- test/hello_world.fromasm | 2 +- test/hello_world.fromasm.clamp | 2 +- test/hello_world.fromasm.clamp.no-opts | 2 +- test/hello_world.fromasm.imprecise | 2 +- test/hello_world.fromasm.imprecise.no-opts | 2 +- test/hello_world.fromasm.no-opts | 2 +- test/hello_world.wast | 2 +- test/hello_world.wast.from-wast | 2 +- test/hello_world.wast.fromBinary | 2 +- test/hello_world.wast.fromBinary.noDebugInfo | 2 +- test/i64-setTempRet0.fromasm | 2 +- test/i64-setTempRet0.fromasm.clamp | 2 +- test/i64-setTempRet0.fromasm.clamp.no-opts | 2 +- test/i64-setTempRet0.fromasm.imprecise | 2 +- .../i64-setTempRet0.fromasm.imprecise.no-opts | 2 +- test/i64-setTempRet0.fromasm.no-opts | 2 +- test/importedSignCast.fromasm | 2 +- test/importedSignCast.fromasm.clamp | 2 +- test/importedSignCast.fromasm.clamp.no-opts | 2 +- test/importedSignCast.fromasm.imprecise | 2 +- ...importedSignCast.fromasm.imprecise.no-opts | 2 +- test/importedSignCast.fromasm.no-opts | 2 +- test/imported_memory.wast.from-wast | 2 +- test/imported_memory.wast.fromBinary | 2 +- ...mported_memory.wast.fromBinary.noDebugInfo | 2 +- test/imported_memory_growth.wast.from-wast | 2 +- test/imported_memory_growth.wast.fromBinary | 2 +- ..._memory_growth.wast.fromBinary.noDebugInfo | 2 +- test/kitchen_sink.wast.from-wast | 2 +- test/kitchen_sink.wast.fromBinary | 2 +- test/kitchen_sink.wast.fromBinary.noDebugInfo | 2 +- test/llvm_autogenerated/byval.wast | 2 +- test/llvm_autogenerated/call.wast | 2 +- test/llvm_autogenerated/cfg-stackify.wast | 2 +- test/llvm_autogenerated/comparisons_f32.wast | 2 +- test/llvm_autogenerated/comparisons_f64.wast | 2 +- test/llvm_autogenerated/comparisons_i32.wast | 2 +- test/llvm_autogenerated/comparisons_i64.wast | 2 +- test/llvm_autogenerated/conv.wast | 2 +- test/llvm_autogenerated/copysign-casts.wast | 2 +- test/llvm_autogenerated/cpus.wast | 2 +- test/llvm_autogenerated/dead-vreg.wast | 2 +- test/llvm_autogenerated/divrem-constant.wast | 2 +- test/llvm_autogenerated/f32.wast | 2 +- test/llvm_autogenerated/f64.wast | 2 +- test/llvm_autogenerated/fast-isel-noreg.wast | 2 +- test/llvm_autogenerated/fast-isel.wast | 2 +- test/llvm_autogenerated/frem.wast | 2 +- test/llvm_autogenerated/func.wast | 2 +- test/llvm_autogenerated/global.wast | 2 +- test/llvm_autogenerated/globl.wast | 2 +- test/llvm_autogenerated/i128.wast | 2 +- .../i32-load-store-alignment.wast | 2 +- test/llvm_autogenerated/i32.wast | 2 +- .../i64-load-store-alignment.wast | 2 +- test/llvm_autogenerated/i64.wast | 2 +- test/llvm_autogenerated/ident.wast | 2 +- test/llvm_autogenerated/immediates.wast | 2 +- test/llvm_autogenerated/indirect-import.wast | 2 +- test/llvm_autogenerated/irreducible-cfg.wast | 2 +- test/llvm_autogenerated/legalize.wast | 2 +- test/llvm_autogenerated/load-ext.wast | 2 +- test/llvm_autogenerated/load-store-i1.wast | 2 +- test/llvm_autogenerated/load.wast | 2 +- .../lower-em-ehsjlj-options.wast | 2 +- test/llvm_autogenerated/mem-intrinsics.wast | 2 +- test/llvm_autogenerated/memory-addr32.wast | 2 +- .../llvm_autogenerated/negative-base-reg.wast | 2 +- .../non-executable-stack.wast | 2 +- test/llvm_autogenerated/offset.wast | 2 +- test/llvm_autogenerated/phi.wast | 2 +- test/llvm_autogenerated/reg-stackify.wast | 2 +- test/llvm_autogenerated/return-int32.wast | 2 +- test/llvm_autogenerated/return-void.wast | 2 +- test/llvm_autogenerated/select.wast | 2 +- test/llvm_autogenerated/signext-zeroext.wast | 2 +- test/llvm_autogenerated/store-trunc.wast | 2 +- test/llvm_autogenerated/store.wast | 2 +- test/llvm_autogenerated/switch.wast | 2 +- test/llvm_autogenerated/unreachable.wast | 2 +- test/llvm_autogenerated/unused-argument.wast | 2 +- test/llvm_autogenerated/userstack.wast | 2 +- test/llvm_autogenerated/varargs.wast | 2 +- test/memory-import.wast.from-wast | 2 +- test/memory-import.wast.fromBinary | 2 +- .../memory-import.wast.fromBinary.noDebugInfo | 2 +- test/memorygrowth.fromasm | 2 +- test/memorygrowth.fromasm.clamp | 2 +- test/memorygrowth.fromasm.clamp.no-opts | 2 +- test/memorygrowth.fromasm.imprecise | 2 +- test/memorygrowth.fromasm.imprecise.no-opts | 2 +- test/memorygrowth.fromasm.no-opts | 2 +- test/merge/basics.wast.combined | 2 +- test/merge/basics.wast.combined.finalized | 2 +- test/merge/basics.wast.combined.finalized.opt | 2 +- test/merge/basics.wast.combined.opt | 2 +- test/merge/dylib.wasm.combined | 2 +- test/merge/dylib.wasm.combined.finalized | 2 +- test/merge/dylib.wasm.combined.finalized.opt | 2 +- test/merge/dylib.wasm.combined.opt | 2 +- test/merge/fusing.wast.combined | 2 +- test/merge/fusing.wast.combined.finalized | 2 +- test/merge/fusing.wast.combined.finalized.opt | 2 +- test/merge/fusing.wast.combined.opt | 2 +- test/merge/global-init.wast.combined | 2 +- .../merge/global-init.wast.combined.finalized | 2 +- .../global-init.wast.combined.finalized.opt | 2 +- test/merge/global-init.wast.combined.opt | 2 +- test/merge/main-lacks-segments.wast.combined | 2 +- ...ain-lacks-segments.wast.combined.finalized | 2 +- ...lacks-segments.wast.combined.finalized.opt | 2 +- .../main-lacks-segments.wast.combined.opt | 2 +- test/merge/post-instantiate-a.wast.combined | 2 +- ...post-instantiate-a.wast.combined.finalized | 2 +- ...-instantiate-a.wast.combined.finalized.opt | 2 +- .../post-instantiate-a.wast.combined.opt | 2 +- test/merge/post-instantiate-b.wast.combined | 2 +- ...post-instantiate-b.wast.combined.finalized | 2 +- ...-instantiate-b.wast.combined.finalized.opt | 2 +- .../post-instantiate-b.wast.combined.opt | 2 +- test/merge/printf.wast.combined | 2 +- test/merge/printf.wast.combined.finalized | 2 +- test/merge/printf.wast.combined.finalized.opt | 2 +- test/merge/printf.wast.combined.opt | 2 +- test/min.fromasm | 2 +- test/min.fromasm.clamp | 2 +- test/min.fromasm.clamp.no-opts | 2 +- test/min.fromasm.imprecise | 2 +- test/min.fromasm.imprecise.no-opts | 2 +- test/min.fromasm.no-opts | 2 +- test/min.wast.from-wast | 2 +- test/min.wast.fromBinary | 2 +- test/min.wast.fromBinary.noDebugInfo | 2 +- test/noffi_f32.fromasm | 2 +- test/noffi_f32.fromasm.clamp | 2 +- test/noffi_f32.fromasm.clamp.no-opts | 2 +- test/noffi_f32.fromasm.imprecise | 2 +- test/noffi_f32.fromasm.imprecise.no-opts | 2 +- test/noffi_f32.fromasm.no-opts | 2 +- test/noffi_i64.fromasm | 2 +- test/noffi_i64.fromasm.clamp | 2 +- test/noffi_i64.fromasm.clamp.no-opts | 2 +- test/noffi_i64.fromasm.imprecise | 2 +- test/noffi_i64.fromasm.imprecise.no-opts | 2 +- test/noffi_i64.fromasm.no-opts | 2 +- test/passes/O.bin.txt | 2 +- test/passes/O.txt | 2 +- test/passes/Oz.txt | 2 +- test/passes/coalesce-locals-learning.txt | 2 +- test/passes/coalesce-locals.txt | 2 +- .../code-pushing_ignore-implicit-traps.txt | 2 +- test/passes/dce.txt | 2 +- test/passes/dce_vacuum.bin.txt | 2 +- test/passes/dce_vacuum.txt | 2 +- .../passes/duplicate-function-elimination.txt | 146 +++++++++--------- test/passes/flatten-control-flow.bin.txt | 2 +- test/passes/flatten-control-flow.txt | 2 +- test/passes/inlining.txt | 2 +- test/passes/instrument-locals.txt | 2 +- test/passes/instrument-memory.txt | 2 +- test/passes/local-cse.txt | 2 +- .../local-cse_ignore-implicit-traps.txt | 2 +- test/passes/log-execution.txt | 2 +- test/passes/memory-packing.txt | 6 +- test/passes/merge-blocks.txt | 2 +- test/passes/metrics.txt | 4 +- test/passes/nm.txt | 2 +- test/passes/optimize-instructions.txt | 2 +- ...optimize-level=2_ignore-implicit-traps.txt | 2 +- test/passes/pick-load-signs.txt | 2 +- test/passes/post-emscripten.txt | 2 +- test/passes/precompute.txt | 2 +- .../precompute_coalesce-locals_vacuum.txt | 2 +- test/passes/print-call-graph.txt | 2 +- test/passes/remove-imports.txt | 2 +- test/passes/remove-memory.txt | 2 +- test/passes/remove-unused-brs.txt | 2 +- ...rs_precompute_vacuum_remove-unused-brs.txt | 2 +- .../remove-unused-brs_shrink-level=1.txt | 2 +- ...s_shrink-level=1_ignore-implicit-traps.txt | 2 +- test/passes/remove-unused-module-elements.txt | 8 +- test/passes/remove-unused-names.txt | 2 +- .../remove-unused-names_merge-blocks.txt | 2 +- .../passes/remove-unused-names_precompute.txt | 2 +- ...-unused-names_remove-unused-brs_vacuum.txt | 2 +- test/passes/remove-unused-names_vacuum.txt | 2 +- test/passes/reorder-functions.txt | 2 +- test/passes/reorder-locals.txt | 2 +- test/passes/rereloop.txt | 2 +- ..._remove-unused-brs_merge-blocks_vacuum.txt | 2 +- test/passes/simplify-locals-nostructure.txt | 2 +- .../simplify-locals-notee-nostructure.txt | 2 +- test/passes/simplify-locals-notee.txt | 2 +- test/passes/simplify-locals.txt | 2 +- test/passes/ssa.txt | 2 +- test/passes/untee.txt | 2 +- test/passes/vacuum.txt | 2 +- ...acuum_remove-unused-names_merge-blocks.txt | 2 +- test/print/memory-import-shared.minified.txt | 1 + test/print/memory-import-shared.txt | 3 + test/print/memory-import-shared.wast | 3 + test/print/memory-notshared.minified.txt | 2 + test/print/memory-notshared.txt | 3 + test/print/memory-notshared.wast | 3 + test/print/memory-shared.minified.txt | 2 + test/print/memory-shared.txt | 3 + test/print/memory-shared.wast | 3 + test/reg_switch.wast.from-wast | 2 +- test/reg_switch.wast.fromBinary | 2 +- test/reg_switch.wast.fromBinary.noDebugInfo | 2 +- test/stacky.wasm.fromBinary | 2 +- test/table-import.wast.from-wast | 2 +- test/table-import.wast.fromBinary | 2 +- test/table-import.wast.fromBinary.noDebugInfo | 2 +- test/two_sides.fromasm | 2 +- test/two_sides.fromasm.clamp | 2 +- test/two_sides.fromasm.clamp.no-opts | 2 +- test/two_sides.fromasm.imprecise | 2 +- test/two_sides.fromasm.imprecise.no-opts | 2 +- test/two_sides.fromasm.no-opts | 2 +- test/unit.fromasm | 2 +- test/unit.fromasm.clamp | 2 +- test/unit.fromasm.clamp.no-opts | 2 +- test/unit.fromasm.imprecise | 2 +- test/unit.fromasm.imprecise.no-opts | 2 +- test/unit.fromasm.no-opts | 2 +- test/unit.wast.from-wast | 2 +- test/unit.wast.fromBinary | 2 +- test/unit.wast.fromBinary.noDebugInfo | 2 +- test/unreachable-import_wasm-only.fromasm | 2 +- ...unreachable-import_wasm-only.fromasm.clamp | 2 +- ...ble-import_wasm-only.fromasm.clamp.no-opts | 2 +- ...achable-import_wasm-only.fromasm.imprecise | 2 +- ...import_wasm-only.fromasm.imprecise.no-opts | 2 +- ...reachable-import_wasm-only.fromasm.no-opts | 2 +- test/use-import-and-drop.fromasm | 2 +- test/use-import-and-drop.fromasm.clamp | 2 +- .../use-import-and-drop.fromasm.clamp.no-opts | 2 +- test/use-import-and-drop.fromasm.imprecise | 2 +- ...-import-and-drop.fromasm.imprecise.no-opts | 2 +- test/use-import-and-drop.fromasm.no-opts | 2 +- test/wasm-only.fromasm | 2 +- test/wasm-only.fromasm.clamp | 2 +- test/wasm-only.fromasm.clamp.no-opts | 2 +- test/wasm-only.fromasm.imprecise | 2 +- test/wasm-only.fromasm.imprecise.no-opts | 2 +- test/wasm-only.fromasm.no-opts | 2 +- 341 files changed, 446 insertions(+), 425 deletions(-) create mode 100644 test/print/memory-import-shared.minified.txt create mode 100644 test/print/memory-import-shared.txt create mode 100644 test/print/memory-import-shared.wast create mode 100644 test/print/memory-notshared.minified.txt create mode 100644 test/print/memory-notshared.txt create mode 100644 test/print/memory-notshared.wast create mode 100644 test/print/memory-shared.minified.txt create mode 100644 test/print/memory-shared.txt create mode 100644 test/print/memory-shared.wast diff --git a/scripts/test/s2wasm.py b/scripts/test/s2wasm.py index 26a22400242..3f38acbace0 100755 --- a/scripts/test/s2wasm.py +++ b/scripts/test/s2wasm.py @@ -30,7 +30,7 @@ def test_s2wasm(): '--import-memory'] output = run_command(cmd) fail_if_not_contained( - output, '(import "env" "memory" (memory $0 1 notshared))') + output, '(import "env" "memory" (memory $0 1))') for dot_s_dir in ['dot_s', 'llvm_autogenerated']: dot_s_path = os.path.join(options.binaryen_test, dot_s_dir) diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp index b3dddac0efd..0494e7d78f3 100644 --- a/src/passes/Print.cpp +++ b/src/passes/Print.cpp @@ -670,9 +670,7 @@ struct PrintSExpression : public Visitor { printName(curr->name) << ' '; o << curr->initial; if (curr->max && curr->max != Memory::kMaxSize) o << ' ' << curr->max; - o << ' '; - if (!curr->shared) o << "not"; - o << "shared"; + if (curr->shared) o << " shared"; o << ")"; } void visitMemory(Memory* curr) { diff --git a/test/break-to-return.wasm.fromBinary b/test/break-to-return.wasm.fromBinary index f647e665640..0bf75cc8bab 100644 --- a/test/break-to-return.wasm.fromBinary +++ b/test/break-to-return.wasm.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "add" (func $0)) (func $0 (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (block $binaryen|break-to-return (result i32) diff --git a/test/ctor-eval/bad-indirect-call.wast.out b/test/ctor-eval/bad-indirect-call.wast.out index 5baadddeb12..fc3d71e42ad 100644 --- a/test/ctor-eval/bad-indirect-call.wast.out +++ b/test/ctor-eval/bad-indirect-call.wast.out @@ -2,7 +2,7 @@ (type $v (func)) (table 1 1 anyfunc) (elem (i32.const 0) $call-indirect) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (func $test1 (type $v) diff --git a/test/ctor-eval/bad-indirect-call2.wast.out b/test/ctor-eval/bad-indirect-call2.wast.out index bfb96512181..d63f1a11e87 100644 --- a/test/ctor-eval/bad-indirect-call2.wast.out +++ b/test/ctor-eval/bad-indirect-call2.wast.out @@ -4,7 +4,7 @@ (import "env" "_abort" (func $_abort)) (table 2 2 anyfunc) (elem (i32.const 0) $_abort $call-indirect) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (func $test1 (type $v) diff --git a/test/ctor-eval/basics-flatten.wast.out b/test/ctor-eval/basics-flatten.wast.out index c29bae561cf..2c0502ab714 100644 --- a/test/ctor-eval/basics-flatten.wast.out +++ b/test/ctor-eval/basics-flatten.wast.out @@ -2,7 +2,7 @@ (type $v (func)) (table 1 1 anyfunc) (elem (i32.const 0) $call-indirect) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "nas\00\00\00aka\00yzkx waka wakm\00\00\00\00\00\00C") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/basics.wast.out b/test/ctor-eval/basics.wast.out index e0efdca9779..4e541385b14 100644 --- a/test/ctor-eval/basics.wast.out +++ b/test/ctor-eval/basics.wast.out @@ -2,7 +2,7 @@ (type $v (func)) (table 1 1 anyfunc) (elem (i32.const 0) $call-indirect) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "nas\00\00\00aka yzkx waka wakm\00\00\00\00\00\00C") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported-min.wast.out b/test/ctor-eval/imported-min.wast.out index 4172d5fcf80..48d4c5796a0 100644 --- a/test/ctor-eval/imported-min.wast.out +++ b/test/ctor-eval/imported-min.wast.out @@ -7,7 +7,7 @@ (global $global0 (mut i32) (get_global $STACKTOP$asm2wasm$import)) (global $global1 (mut i32) (get_global $STACK_MAX$asm2wasm$import)) (global $do-not-use (mut i32) (get_global $tempDoublePtr)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported.wast.out b/test/ctor-eval/imported.wast.out index 9965dc1692b..38fcb184218 100644 --- a/test/ctor-eval/imported.wast.out +++ b/test/ctor-eval/imported.wast.out @@ -7,7 +7,7 @@ (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) (global $do-not-use (mut i32) (get_global $tempDoublePtr)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported2.wast.out b/test/ctor-eval/imported2.wast.out index 8ebd208353a..26b91cc3590 100644 --- a/test/ctor-eval/imported2.wast.out +++ b/test/ctor-eval/imported2.wast.out @@ -4,7 +4,7 @@ (import "env" "STACK_MAX" (global $STACK_MAX i32)) (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) (global $mine (mut i32) (i32.const 1)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/imported3.wast.out b/test/ctor-eval/imported3.wast.out index 5d88b8a6509..6d8fab86718 100644 --- a/test/ctor-eval/imported3.wast.out +++ b/test/ctor-eval/imported3.wast.out @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) (global $mine (mut i32) (get_global $tempDoublePtr)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/indirect-call3.wast.out b/test/ctor-eval/indirect-call3.wast.out index cca3fc7ef7e..27f661c3091 100644 --- a/test/ctor-eval/indirect-call3.wast.out +++ b/test/ctor-eval/indirect-call3.wast.out @@ -5,7 +5,7 @@ (import "env" "_abort" (func $_abort)) (table 2 2 anyfunc) (elem (get_global $tableBase) $_abort $call-indirect) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C") (export "test1" (func $test1)) (func $test1 (type $v) diff --git a/test/ctor-eval/just_some.wast.out b/test/ctor-eval/just_some.wast.out index 96f332a2d72..79bb19df6fd 100644 --- a/test/ctor-eval/just_some.wast.out +++ b/test/ctor-eval/just_some.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "wasa waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/no_partial.wast.out b/test/ctor-eval/no_partial.wast.out index f79de10f3c3..0caa401d4a1 100644 --- a/test/ctor-eval/no_partial.wast.out +++ b/test/ctor-eval/no_partial.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (func $test1 (type $0) diff --git a/test/ctor-eval/unsafe_call.wast.out b/test/ctor-eval/unsafe_call.wast.out index 59a9e985c7c..7d88676102d 100644 --- a/test/ctor-eval/unsafe_call.wast.out +++ b/test/ctor-eval/unsafe_call.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/unsafe_store.wast.out b/test/ctor-eval/unsafe_store.wast.out index 46466a41966..7fa97d87662 100644 --- a/test/ctor-eval/unsafe_store.wast.out +++ b/test/ctor-eval/unsafe_store.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 9) "mwaka waka waka waka waka") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/unsafe_store2.wast.out b/test/ctor-eval/unsafe_store2.wast.out index 75639c2a8ff..7af56749aa1 100644 --- a/test/ctor-eval/unsafe_store2.wast.out +++ b/test/ctor-eval/unsafe_store2.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka waka waka wakam") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/ctor-eval/unsafe_store3.wast.out b/test/ctor-eval/unsafe_store3.wast.out index 4484f786193..cbf66c6da82 100644 --- a/test/ctor-eval/unsafe_store3.wast.out +++ b/test/ctor-eval/unsafe_store3.wast.out @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 10) "waka waka waka waka wakm") (export "test1" (func $test1)) (export "test2" (func $test2)) diff --git a/test/debugInfo.fromasm b/test/debugInfo.fromasm index 3e571218ab1..f1100084119 100644 --- a/test/debugInfo.fromasm +++ b/test/debugInfo.fromasm @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.clamp b/test/debugInfo.fromasm.clamp index 3e571218ab1..f1100084119 100644 --- a/test/debugInfo.fromasm.clamp +++ b/test/debugInfo.fromasm.clamp @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.clamp.no-opts b/test/debugInfo.fromasm.clamp.no-opts index 39f7a7034f1..c56627bcbea 100644 --- a/test/debugInfo.fromasm.clamp.no-opts +++ b/test/debugInfo.fromasm.clamp.no-opts @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.imprecise b/test/debugInfo.fromasm.imprecise index 377ffda44bb..824ade74e73 100644 --- a/test/debugInfo.fromasm.imprecise +++ b/test/debugInfo.fromasm.imprecise @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.imprecise.no-opts b/test/debugInfo.fromasm.imprecise.no-opts index 22549a9d180..1ec751ef4d0 100644 --- a/test/debugInfo.fromasm.imprecise.no-opts +++ b/test/debugInfo.fromasm.imprecise.no-opts @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/debugInfo.fromasm.no-opts b/test/debugInfo.fromasm.no-opts index 39f7a7034f1..c56627bcbea 100644 --- a/test/debugInfo.fromasm.no-opts +++ b/test/debugInfo.fromasm.no-opts @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/dot_s/alias.wast b/test/dot_s/alias.wast index 81dc7d52975..7e439bccb4b 100644 --- a/test/dot_s/alias.wast +++ b/test/dot_s/alias.wast @@ -1,6 +1,6 @@ (module (type $FUNCSIG$v (func)) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 2 2 anyfunc) (elem (i32.const 0) $__wasm_nullptr $__exit) (data (i32.const 16) "\d2\04\00\00\00\00\00\00)\t\00\00") diff --git a/test/dot_s/alternate-lcomm.wast b/test/dot_s/alternate-lcomm.wast index d38a9de58ae..625760209ae 100644 --- a/test/dot_s/alternate-lcomm.wast +++ b/test/dot_s/alternate-lcomm.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast index fb54ad3efa3..3e9ffce6534 100644 --- a/test/dot_s/asm_const.wast +++ b/test/dot_s/asm_const.wast @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vi (func (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (import "env" "emscripten_asm_const_v" (func $emscripten_asm_const_v (param i32))) (table 0 anyfunc) (data (i32.const 16) "{ Module.print(\"hello, world!\"); }\00") diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast index 4a7f5eaf746..abdbaaa5aa2 100644 --- a/test/dot_s/basics.wast +++ b/test/dot_s/basics.wast @@ -3,7 +3,7 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "puts" (func $puts (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 2 2 anyfunc) (elem (i32.const 0) $__wasm_nullptr $main) (data (i32.const 16) "hello, world!\n\00") diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast index 23c56ab4726..1c35fdf763b 100644 --- a/test/dot_s/bcp-1.wast +++ b/test/dot_s/bcp-1.wast @@ -5,7 +5,7 @@ (type $FUNCSIG$vi (func (param i32))) (import "env" "abort" (func $abort)) (import "env" "exit" (func $exit (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 18 18 anyfunc) (elem (i32.const 0) $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2) (data (i32.const 16) "\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00") diff --git a/test/dot_s/data-offset-folding.wast b/test/dot_s/data-offset-folding.wast index 3e356295079..074c8681fe5 100644 --- a/test/dot_s/data-offset-folding.wast +++ b/test/dot_s/data-offset-folding.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 12) "\00\00\00\00") (data (i32.const 416) "`\00\00\00") diff --git a/test/dot_s/debug.wast b/test/dot_s/debug.wast index 0ef17916aa6..57079919a19 100644 --- a/test/dot_s/debug.wast +++ b/test/dot_s/debug.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/dso_handle.wast b/test/dot_s/dso_handle.wast index 06257400f80..cdfc998df84 100644 --- a/test/dot_s/dso_handle.wast +++ b/test/dot_s/dso_handle.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/dyncall.wast b/test/dot_s/dyncall.wast index bd59243dc9a..19f6e00bc85 100644 --- a/test/dot_s/dyncall.wast +++ b/test/dot_s/dyncall.wast @@ -4,7 +4,7 @@ (type $FUNCSIG$if (func (param f32) (result i32))) (type $FUNCSIG$vd (func (param f64))) (type $FUNCSIG$ffjjdi (func (param f32 i64 i64 f64 i32) (result f32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 6 6 anyfunc) (elem (i32.const 0) $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2) (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/exit.wast b/test/dot_s/exit.wast index 129ab052fb1..4f585d13cc6 100644 --- a/test/dot_s/exit.wast +++ b/test/dot_s/exit.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$vi (func (param i32))) (import "env" "exit" (func $exit (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/export_malloc_free.wast b/test/dot_s/export_malloc_free.wast index 5de87e6f6d7..7d601ff2196 100644 --- a/test/dot_s/export_malloc_free.wast +++ b/test/dot_s/export_malloc_free.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/fix_em_ehsjlj_names.wast b/test/dot_s/fix_em_ehsjlj_names.wast index fe0e8a4a1b7..429e2349430 100644 --- a/test/dot_s/fix_em_ehsjlj_names.wast +++ b/test/dot_s/fix_em_ehsjlj_names.wast @@ -12,7 +12,7 @@ (import "env" "invoke_iii" (func $invoke_iii (param i32 i32 i32) (result i32))) (import "env" "invoke_iiii" (func $invoke_iiii (param i32 i32 i32 i32) (result i32))) (import "env" "invoke_v" (func $invoke_v (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 5 5 anyfunc) (elem (i32.const 0) $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_) (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/function-data-sections.wast b/test/dot_s/function-data-sections.wast index 41162cb3b9c..64a7a67d4cb 100644 --- a/test/dot_s/function-data-sections.wast +++ b/test/dot_s/function-data-sections.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 12) "\00\00\00\00") (data (i32.const 16) "\01\00\00\00") diff --git a/test/dot_s/globals.wast b/test/dot_s/globals.wast index 3f8b9723b62..2fe329a8cd4 100644 --- a/test/dot_s/globals.wast +++ b/test/dot_s/globals.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (import "env" "imported_global" (global $imported_global i32)) (table 0 anyfunc) (data (i32.const 12) "\11\00\00\00") diff --git a/test/dot_s/hostFinalize.wast b/test/dot_s/hostFinalize.wast index 5c2bc670840..79ba6be0e50 100644 --- a/test/dot_s/hostFinalize.wast +++ b/test/dot_s/hostFinalize.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast index e442edff2f8..07e63662131 100644 --- a/test/dot_s/indidx.wast +++ b/test/dot_s/indidx.wast @@ -2,7 +2,7 @@ (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$v (func)) (import "env" "getchar" (func $getchar (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 5 5 anyfunc) (elem (i32.const 0) $__wasm_nullptr $c $b $d $a) (data (i32.const 16) "\04\00\00\00\02\00\00\00\01\00\00\00\03\00\00\00") diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast index c435f0c7534..8df5e85a5bd 100644 --- a/test/dot_s/indirect-import.wast +++ b/test/dot_s/indirect-import.wast @@ -7,7 +7,7 @@ (import "env" "extern_ijidf" (func $extern_ijidf (param i64 i32 f64 f32) (result i32))) (import "env" "extern_v" (func $extern_v)) (import "env" "extern_vj" (func $extern_vj (param i64))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (import "env" "extern_fd" (func $extern_fd (param f64) (result f32))) (import "env" "extern_struct" (func $extern_struct (param i32))) (import "env" "extern_sret" (func $extern_sret (param i32))) diff --git a/test/dot_s/initializers.wast b/test/dot_s/initializers.wast index da71fa9b7cc..1c51f433f33 100644 --- a/test/dot_s/initializers.wast +++ b/test/dot_s/initializers.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/lcomm-in-text-segment.wast b/test/dot_s/lcomm-in-text-segment.wast index 18499d1e820..bbd7d8c4809 100644 --- a/test/dot_s/lcomm-in-text-segment.wast +++ b/test/dot_s/lcomm-in-text-segment.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 20) "\10\00\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/local_align.wast b/test/dot_s/local_align.wast index 5ff774f6120..1991656fda2 100644 --- a/test/dot_s/local_align.wast +++ b/test/dot_s/local_align.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/macClangMetaData.wast b/test/dot_s/macClangMetaData.wast index 6860f04fd0f..2dd3ff2d2d7 100644 --- a/test/dot_s/macClangMetaData.wast +++ b/test/dot_s/macClangMetaData.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "puts" (func $puts (param i32) (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 16) "Hello, World!\00") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast index 9884ede114d..5cf90fcc7c7 100644 --- a/test/dot_s/memops.wast +++ b/test/dot_s/memops.wast @@ -1,6 +1,6 @@ (module (type $FUNCSIG$vi (func (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (import "env" "emscripten_asm_const_v" (func $emscripten_asm_const_v (param i32))) (table 0 anyfunc) (data (i32.const 16) "{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }\00") diff --git a/test/dot_s/minimal.wast b/test/dot_s/minimal.wast index 06599ab9d8e..05c2aafc02f 100644 --- a/test/dot_s/minimal.wast +++ b/test/dot_s/minimal.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/permute.wast b/test/dot_s/permute.wast index 3ae71352754..9aa6a1d9b4d 100644 --- a/test/dot_s/permute.wast +++ b/test/dot_s/permute.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 16) "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/relocation.wast b/test/dot_s/relocation.wast index 7736643feba..c0518095490 100644 --- a/test/dot_s/relocation.wast +++ b/test/dot_s/relocation.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 12) "\10\00\00\00") (data (i32.const 16) "\0c\00\00\00") diff --git a/test/dot_s/return.wast b/test/dot_s/return.wast index a8a2eddb8e7..95a7cf98996 100644 --- a/test/dot_s/return.wast +++ b/test/dot_s/return.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/start_main0.wast b/test/dot_s/start_main0.wast index fde98d3f13f..1ffa0a347bb 100644 --- a/test/dot_s/start_main0.wast +++ b/test/dot_s/start_main0.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/start_main2.wast b/test/dot_s/start_main2.wast index d7438333150..1b5a2f50e6a 100644 --- a/test/dot_s/start_main2.wast +++ b/test/dot_s/start_main2.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/symbolic-offset.wast b/test/dot_s/symbolic-offset.wast index 62a185acc4d..7ec41fff942 100644 --- a/test/dot_s/symbolic-offset.wast +++ b/test/dot_s/symbolic-offset.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 12) "\01\00\00\00\00\00\00\00\00\00\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/dot_s/text_before_type.wast b/test/dot_s/text_before_type.wast index 25a744dff33..29edaa45d78 100644 --- a/test/dot_s/text_before_type.wast +++ b/test/dot_s/text_before_type.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/unreachable_blocks.wast b/test/dot_s/unreachable_blocks.wast index a2592669727..ecaa790145c 100644 --- a/test/dot_s/unreachable_blocks.wast +++ b/test/dot_s/unreachable_blocks.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dot_s/visibilities.wast b/test/dot_s/visibilities.wast index 62cd6d143dd..4cb94d2ce8d 100644 --- a/test/dot_s/visibilities.wast +++ b/test/dot_s/visibilities.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (export "stackSave" (func $stackSave)) (export "stackAlloc" (func $stackAlloc)) diff --git a/test/dylib.wasm.fromBinary b/test/dylib.wasm.fromBinary index fb832660d92..aff341754e0 100644 --- a/test/dylib.wasm.fromBinary +++ b/test/dylib.wasm.fromBinary @@ -4,7 +4,7 @@ (type $2 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (global $global$0 (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm b/test/dynamicLibrary.fromasm index 03148e3f0a3..cd0d1d224b6 100644 --- a/test/dynamicLibrary.fromasm +++ b/test/dynamicLibrary.fromasm @@ -4,7 +4,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "tableBase" (global $tableBase i32)) (global $STACKTOP (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm.clamp b/test/dynamicLibrary.fromasm.clamp index 03148e3f0a3..cd0d1d224b6 100644 --- a/test/dynamicLibrary.fromasm.clamp +++ b/test/dynamicLibrary.fromasm.clamp @@ -4,7 +4,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "tableBase" (global $tableBase i32)) (global $STACKTOP (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm.clamp.no-opts b/test/dynamicLibrary.fromasm.clamp.no-opts index c8d39c19f8b..cbfb2e4fd3f 100644 --- a/test/dynamicLibrary.fromasm.clamp.no-opts +++ b/test/dynamicLibrary.fromasm.clamp.no-opts @@ -10,7 +10,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (global $DYNAMICTOP_PTR (mut i32) (get_global $DYNAMICTOP_PTR$asm2wasm$import)) (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) diff --git a/test/dynamicLibrary.fromasm.imprecise b/test/dynamicLibrary.fromasm.imprecise index 71a4ae9edda..d30a1c912cf 100644 --- a/test/dynamicLibrary.fromasm.imprecise +++ b/test/dynamicLibrary.fromasm.imprecise @@ -4,7 +4,7 @@ (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "tableBase" (global $tableBase i32)) (global $STACKTOP (mut i32) (i32.const 0)) diff --git a/test/dynamicLibrary.fromasm.imprecise.no-opts b/test/dynamicLibrary.fromasm.imprecise.no-opts index c8d39c19f8b..cbfb2e4fd3f 100644 --- a/test/dynamicLibrary.fromasm.imprecise.no-opts +++ b/test/dynamicLibrary.fromasm.imprecise.no-opts @@ -10,7 +10,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (global $DYNAMICTOP_PTR (mut i32) (get_global $DYNAMICTOP_PTR$asm2wasm$import)) (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) diff --git a/test/dynamicLibrary.fromasm.no-opts b/test/dynamicLibrary.fromasm.no-opts index c8d39c19f8b..cbfb2e4fd3f 100644 --- a/test/dynamicLibrary.fromasm.no-opts +++ b/test/dynamicLibrary.fromasm.no-opts @@ -10,7 +10,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abortStackOverflow" (func $abortStackOverflow (param i32))) (import "env" "_puts" (func $_puts (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (global $DYNAMICTOP_PTR (mut i32) (get_global $DYNAMICTOP_PTR$asm2wasm$import)) (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm index 8c9431ee892..b0128b509e7 100644 --- a/test/emcc_O2_hello_world.fromasm +++ b/test/emcc_O2_hello_world.fromasm @@ -23,7 +23,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.clamp b/test/emcc_O2_hello_world.fromasm.clamp index 8c9431ee892..b0128b509e7 100644 --- a/test/emcc_O2_hello_world.fromasm.clamp +++ b/test/emcc_O2_hello_world.fromasm.clamp @@ -23,7 +23,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.clamp.no-opts b/test/emcc_O2_hello_world.fromasm.clamp.no-opts index 8f8208c269f..427135b306d 100644 --- a/test/emcc_O2_hello_world.fromasm.clamp.no-opts +++ b/test/emcc_O2_hello_world.fromasm.clamp.no-opts @@ -27,7 +27,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise index 92ecaa03309..824fcd3da05 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise +++ b/test/emcc_O2_hello_world.fromasm.imprecise @@ -23,7 +23,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts index 241f6d5cc7b..9ae5ccea155 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts @@ -27,7 +27,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts index 8f8208c269f..427135b306d 100644 --- a/test/emcc_O2_hello_world.fromasm.no-opts +++ b/test/emcc_O2_hello_world.fromasm.no-opts @@ -27,7 +27,7 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index 69094953128..9d87a0e2cb6 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -29,7 +29,7 @@ (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.clamp b/test/emcc_hello_world.fromasm.clamp index 421490256fd..24b65fc1f05 100644 --- a/test/emcc_hello_world.fromasm.clamp +++ b/test/emcc_hello_world.fromasm.clamp @@ -27,7 +27,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.clamp.no-opts b/test/emcc_hello_world.fromasm.clamp.no-opts index a4aada5f900..3662e5d3617 100644 --- a/test/emcc_hello_world.fromasm.clamp.no-opts +++ b/test/emcc_hello_world.fromasm.clamp.no-opts @@ -31,7 +31,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index 3ee061df271..ed7ba8aa4b3 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -27,7 +27,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts index cc7828d7c57..da6f2fdc57c 100644 --- a/test/emcc_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_hello_world.fromasm.imprecise.no-opts @@ -31,7 +31,7 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts index 902abd12685..5f9e12f8347 100644 --- a/test/emcc_hello_world.fromasm.no-opts +++ b/test/emcc_hello_world.fromasm.no-opts @@ -33,7 +33,7 @@ (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm b/test/empty.fromasm index 8cfdc6a0c67..0e8d5c63bde 100644 --- a/test/empty.fromasm +++ b/test/empty.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.clamp b/test/empty.fromasm.clamp index 8cfdc6a0c67..0e8d5c63bde 100644 --- a/test/empty.fromasm.clamp +++ b/test/empty.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.clamp.no-opts b/test/empty.fromasm.clamp.no-opts index 8c0fb002264..ddb433043ea 100644 --- a/test/empty.fromasm.clamp.no-opts +++ b/test/empty.fromasm.clamp.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.imprecise b/test/empty.fromasm.imprecise index 8c0fb002264..ddb433043ea 100644 --- a/test/empty.fromasm.imprecise +++ b/test/empty.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.imprecise.no-opts b/test/empty.fromasm.imprecise.no-opts index 8c0fb002264..ddb433043ea 100644 --- a/test/empty.fromasm.imprecise.no-opts +++ b/test/empty.fromasm.imprecise.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty.fromasm.no-opts b/test/empty.fromasm.no-opts index 8c0fb002264..ddb433043ea 100644 --- a/test/empty.fromasm.no-opts +++ b/test/empty.fromasm.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/empty_imported_table.wast.from-wast b/test/empty_imported_table.wast.from-wast index 822385a908e..1ad108fdedf 100644 --- a/test/empty_imported_table.wast.from-wast +++ b/test/empty_imported_table.wast.from-wast @@ -1,4 +1,4 @@ (module (import "env" "table" (table 0 0 anyfunc)) - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/empty_imported_table.wast.fromBinary b/test/empty_imported_table.wast.fromBinary index cecd5b73416..9e0c240cd78 100644 --- a/test/empty_imported_table.wast.fromBinary +++ b/test/empty_imported_table.wast.fromBinary @@ -1,5 +1,5 @@ (module (import "env" "table" (table 0 0 anyfunc)) - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/empty_imported_table.wast.fromBinary.noDebugInfo b/test/empty_imported_table.wast.fromBinary.noDebugInfo index cecd5b73416..9e0c240cd78 100644 --- a/test/empty_imported_table.wast.fromBinary.noDebugInfo +++ b/test/empty_imported_table.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module (import "env" "table" (table 0 0 anyfunc)) - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/empty_table.wast.from-wast b/test/empty_table.wast.from-wast index af96c7193f0..7254336c546 100644 --- a/test/empty_table.wast.from-wast +++ b/test/empty_table.wast.from-wast @@ -1,4 +1,4 @@ (module (table 0 0 anyfunc) - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/empty_table.wast.fromBinary b/test/empty_table.wast.fromBinary index 64828f985dc..07bab7efa35 100644 --- a/test/empty_table.wast.fromBinary +++ b/test/empty_table.wast.fromBinary @@ -1,5 +1,5 @@ (module (table 0 0 anyfunc) - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/empty_table.wast.fromBinary.noDebugInfo b/test/empty_table.wast.fromBinary.noDebugInfo index 64828f985dc..07bab7efa35 100644 --- a/test/empty_table.wast.fromBinary.noDebugInfo +++ b/test/empty_table.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module (table 0 0 anyfunc) - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/example/c-api-hello-world.txt b/test/example/c-api-hello-world.txt index 930d17aea6a..640074360b4 100644 --- a/test/example/c-api-hello-world.txt +++ b/test/example/c-api-hello-world.txt @@ -1,6 +1,6 @@ (module (type $iii (func (param i32 i32) (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $adder (type $iii) (param $0 i32) (param $1 i32) (result i32) (i32.add (get_local $0) diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index 9f03914fe1e..d366a3c7ffe 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -14,7 +14,7 @@ BinaryenFloat64: 4 (import "module" "base" (func $an-imported (param i32 f64) (result f32))) (table 1 1 anyfunc) (elem (i32.const 0) "$kitchen()sinker") - (memory $0 1 256 notshared) + (memory $0 1 256) (data (i32.const 10) "hello, world") (export "kitchen_sinker" (func "$kitchen()sinker")) (export "mem" (memory $0)) @@ -542,7 +542,7 @@ raw: (type $vi (func (param i32))) (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $just-one-block (type $v) (local $0 i32) (call $check @@ -1025,12 +1025,12 @@ raw: ) optimized: (module - (memory $0 0 notshared) + (memory $0 0) ) module loaded from binary form: (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $adder (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.add (get_local $var$0) @@ -1042,7 +1042,7 @@ module loaded from binary form: (type $vi (func (param i32))) (type $v (func)) (import "spectest" "print" (func $print-i32 (param i32))) - (memory $0 0 notshared) + (memory $0 0) (start $starter) (func $starter (type $v) (call $print-i32 @@ -1053,7 +1053,7 @@ module loaded from binary form: (i32.const 1234) (module (type $v (func)) - (memory $0 0 notshared) + (memory $0 0) (func $func (type $v) (local $0 i32) (set_local $0 @@ -1404,7 +1404,7 @@ int main() { (import "module" "base" (func $an-imported (param i32 f64) (result f32))) (table 1 1 anyfunc) (elem (i32.const 0) "$kitchen()sinker") - (memory $0 1 256 notshared) + (memory $0 1 256) (data (i32.const 10) "hello, world") (export "kitchen_sinker" (func "$kitchen()sinker")) (export "mem" (memory $0)) @@ -2392,7 +2392,7 @@ raw: (type $vi (func (param i32))) (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $just-one-block (type $v) (local $0 i32) (call $check @@ -2879,7 +2879,7 @@ raw: optimized: BinaryenModulePrint(the_module); (module - (memory $0 0 notshared) + (memory $0 0) ) BinaryenModuleDispose(the_module); functionTypes.clear(); diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt index d4ad4eef46a..dc35b1f0459 100644 --- a/test/example/c-api-kitchen-sink.txt.txt +++ b/test/example/c-api-kitchen-sink.txt.txt @@ -9,7 +9,7 @@ (import "module" "base" (func $an-imported (param i32 f64) (result f32))) (table 1 1 anyfunc) (elem (i32.const 0) "$kitchen()sinker") - (memory $0 1 256 notshared) + (memory $0 1 256) (data (i32.const 10) "hello, world") (export "kitchen_sinker" (func "$kitchen()sinker")) (export "mem" (memory $0)) @@ -536,7 +536,7 @@ (type $vi (func (param i32))) (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $just-one-block (type $v) (local $0 i32) (call $check @@ -1018,5 +1018,5 @@ ) ) (module - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/example/c-api-unused-mem.txt b/test/example/c-api-unused-mem.txt index 46381ed957d..b073d4d0249 100644 --- a/test/example/c-api-unused-mem.txt +++ b/test/example/c-api-unused-mem.txt @@ -1,7 +1,7 @@ (module (type $rustfn-0-3 (func)) (type $__wasm_start (func)) - (memory $0 1024 1024 notshared) + (memory $0 1024 1024) (export "memory" (memory $0)) (export "main" (func $main)) (export "rust_entry" (func $__wasm_start)) @@ -50,7 +50,7 @@ (module (type $0 (func)) (type $1 (func)) - (memory $0 1024 1024 notshared) + (memory $0 1024 1024) (export "memory" (memory $0)) (export "main" (func $main)) (export "rust_entry" (func $__wasm_start)) diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt index 09e1b007018..438a4bca1cd 100644 --- a/test/example/relooper-fuzz.txt +++ b/test/example/relooper-fuzz.txt @@ -3,7 +3,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1 notshared) + (memory $0 1 1) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) @@ -296,7 +296,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1 notshared) + (memory $0 1 1) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) diff --git a/test/example/relooper-fuzz1.txt b/test/example/relooper-fuzz1.txt index a6fd22e0cfc..0214d9c8164 100644 --- a/test/example/relooper-fuzz1.txt +++ b/test/example/relooper-fuzz1.txt @@ -3,7 +3,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1 notshared) + (memory $0 1 1) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) @@ -272,7 +272,7 @@ (type $v (func)) (type $vi (func (param i32))) (import "spectest" "print" (func $print (param i32))) - (memory $0 1 1 notshared) + (memory $0 1 1) (export "mem" (memory $0)) (start $main) (func $check (type $i) (result i32) diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary index 412f4641eaf..3f940fa8ad6 100644 --- a/test/fib-dbg.wasm.fromBinary +++ b/test/fib-dbg.wasm.fromBinary @@ -13,7 +13,7 @@ (import "env" "fb" (global $import$6 i32)) (import "global" "NaN" (global $import$7 f64)) (import "global" "Infinity" (global $import$8 f64)) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $import$11 i32)) (import "env" "tableBase" (global $import$12 i32)) diff --git a/test/hello_world.fromasm b/test/hello_world.fromasm index fa5c0f531d7..51c2fd31d6a 100644 --- a/test/hello_world.fromasm +++ b/test/hello_world.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.clamp b/test/hello_world.fromasm.clamp index fa5c0f531d7..51c2fd31d6a 100644 --- a/test/hello_world.fromasm.clamp +++ b/test/hello_world.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.clamp.no-opts b/test/hello_world.fromasm.clamp.no-opts index f823b31fc2d..3d2e51b9ccd 100644 --- a/test/hello_world.fromasm.clamp.no-opts +++ b/test/hello_world.fromasm.clamp.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.imprecise b/test/hello_world.fromasm.imprecise index 95eb1977668..2e4a2f12d51 100644 --- a/test/hello_world.fromasm.imprecise +++ b/test/hello_world.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.imprecise.no-opts b/test/hello_world.fromasm.imprecise.no-opts index f823b31fc2d..3d2e51b9ccd 100644 --- a/test/hello_world.fromasm.imprecise.no-opts +++ b/test/hello_world.fromasm.imprecise.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.fromasm.no-opts b/test/hello_world.fromasm.no-opts index f823b31fc2d..3d2e51b9ccd 100644 --- a/test/hello_world.fromasm.no-opts +++ b/test/hello_world.fromasm.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/hello_world.wast b/test/hello_world.wast index 0c1fe47b81b..ade7bd1ef0d 100644 --- a/test/hello_world.wast +++ b/test/hello_world.wast @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "add" (func $add)) (func $add (type $0) (param $x i32) (param $y i32) (result i32) (i32.add diff --git a/test/hello_world.wast.from-wast b/test/hello_world.wast.from-wast index 0c1fe47b81b..ade7bd1ef0d 100644 --- a/test/hello_world.wast.from-wast +++ b/test/hello_world.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "add" (func $add)) (func $add (type $0) (param $x i32) (param $y i32) (result i32) (i32.add diff --git a/test/hello_world.wast.fromBinary b/test/hello_world.wast.fromBinary index b3641a7611f..a96857ac927 100644 --- a/test/hello_world.wast.fromBinary +++ b/test/hello_world.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "add" (func $add)) (func $add (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.add diff --git a/test/hello_world.wast.fromBinary.noDebugInfo b/test/hello_world.wast.fromBinary.noDebugInfo index 0f0d0c18d31..6e2270ecf76 100644 --- a/test/hello_world.wast.fromBinary.noDebugInfo +++ b/test/hello_world.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "add" (func $0)) (func $0 (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (i32.add diff --git a/test/i64-setTempRet0.fromasm b/test/i64-setTempRet0.fromasm index 021e4c1df55..078b1f0ef83 100644 --- a/test/i64-setTempRet0.fromasm +++ b/test/i64-setTempRet0.fromasm @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.clamp b/test/i64-setTempRet0.fromasm.clamp index 021e4c1df55..078b1f0ef83 100644 --- a/test/i64-setTempRet0.fromasm.clamp +++ b/test/i64-setTempRet0.fromasm.clamp @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.clamp.no-opts b/test/i64-setTempRet0.fromasm.clamp.no-opts index 51f7047e4ac..d1f1ed656ab 100644 --- a/test/i64-setTempRet0.fromasm.clamp.no-opts +++ b/test/i64-setTempRet0.fromasm.clamp.no-opts @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.imprecise b/test/i64-setTempRet0.fromasm.imprecise index cb2257a3114..bda8795579e 100644 --- a/test/i64-setTempRet0.fromasm.imprecise +++ b/test/i64-setTempRet0.fromasm.imprecise @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.imprecise.no-opts b/test/i64-setTempRet0.fromasm.imprecise.no-opts index 51f7047e4ac..d1f1ed656ab 100644 --- a/test/i64-setTempRet0.fromasm.imprecise.no-opts +++ b/test/i64-setTempRet0.fromasm.imprecise.no-opts @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/i64-setTempRet0.fromasm.no-opts b/test/i64-setTempRet0.fromasm.no-opts index 51f7047e4ac..d1f1ed656ab 100644 --- a/test/i64-setTempRet0.fromasm.no-opts +++ b/test/i64-setTempRet0.fromasm.no-opts @@ -3,7 +3,7 @@ (type $legaltype$illegalImportResult (func (result i32))) (import "env" "illegalImportResult" (func $illegalImportResult (result i64))) (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm b/test/importedSignCast.fromasm index b88a8e04c03..29fdf022443 100644 --- a/test/importedSignCast.fromasm +++ b/test/importedSignCast.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.clamp b/test/importedSignCast.fromasm.clamp index b88a8e04c03..29fdf022443 100644 --- a/test/importedSignCast.fromasm.clamp +++ b/test/importedSignCast.fromasm.clamp @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.clamp.no-opts b/test/importedSignCast.fromasm.clamp.no-opts index a6c198ad948..6043bfdbf88 100644 --- a/test/importedSignCast.fromasm.clamp.no-opts +++ b/test/importedSignCast.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.imprecise b/test/importedSignCast.fromasm.imprecise index 463f65e797f..fbe186610a3 100644 --- a/test/importedSignCast.fromasm.imprecise +++ b/test/importedSignCast.fromasm.imprecise @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.imprecise.no-opts b/test/importedSignCast.fromasm.imprecise.no-opts index a6c198ad948..6043bfdbf88 100644 --- a/test/importedSignCast.fromasm.imprecise.no-opts +++ b/test/importedSignCast.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/importedSignCast.fromasm.no-opts b/test/importedSignCast.fromasm.no-opts index a6c198ad948..6043bfdbf88 100644 --- a/test/importedSignCast.fromasm.no-opts +++ b/test/importedSignCast.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 1 1 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/imported_memory.wast.from-wast b/test/imported_memory.wast.from-wast index 8e38e6afc26..ca28ac75150 100644 --- a/test/imported_memory.wast.from-wast +++ b/test/imported_memory.wast.from-wast @@ -1,4 +1,4 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 256 256 anyfunc)) ) diff --git a/test/imported_memory.wast.fromBinary b/test/imported_memory.wast.fromBinary index 66f1afa364d..3e280b9cb9e 100644 --- a/test/imported_memory.wast.fromBinary +++ b/test/imported_memory.wast.fromBinary @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 256 256 anyfunc)) ) diff --git a/test/imported_memory.wast.fromBinary.noDebugInfo b/test/imported_memory.wast.fromBinary.noDebugInfo index 66f1afa364d..3e280b9cb9e 100644 --- a/test/imported_memory.wast.fromBinary.noDebugInfo +++ b/test/imported_memory.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 256 256 anyfunc)) ) diff --git a/test/imported_memory_growth.wast.from-wast b/test/imported_memory_growth.wast.from-wast index 3e4f699ebbf..44c5b1644a2 100644 --- a/test/imported_memory_growth.wast.from-wast +++ b/test/imported_memory_growth.wast.from-wast @@ -1,4 +1,4 @@ (module - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 256 anyfunc)) ) diff --git a/test/imported_memory_growth.wast.fromBinary b/test/imported_memory_growth.wast.fromBinary index 658a196b6b8..d175ff2b274 100644 --- a/test/imported_memory_growth.wast.fromBinary +++ b/test/imported_memory_growth.wast.fromBinary @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 256 anyfunc)) ) diff --git a/test/imported_memory_growth.wast.fromBinary.noDebugInfo b/test/imported_memory_growth.wast.fromBinary.noDebugInfo index 658a196b6b8..d175ff2b274 100644 --- a/test/imported_memory_growth.wast.fromBinary.noDebugInfo +++ b/test/imported_memory_growth.wast.fromBinary.noDebugInfo @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 256 anyfunc)) ) diff --git a/test/kitchen_sink.wast.from-wast b/test/kitchen_sink.wast.from-wast index 55e475bdf65..50e81f1d95a 100644 --- a/test/kitchen_sink.wast.from-wast +++ b/test/kitchen_sink.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (memory $0 4096 4096 notshared) + (memory $0 4096 4096) (data (i32.const 1026) "\14\00") (func $kitchensink (type $0) (result i32) (block $block0 (result i32) diff --git a/test/kitchen_sink.wast.fromBinary b/test/kitchen_sink.wast.fromBinary index a017906a3af..9c6d2686a68 100644 --- a/test/kitchen_sink.wast.fromBinary +++ b/test/kitchen_sink.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (memory $0 4096 4096 notshared) + (memory $0 4096 4096) (data (i32.const 1026) "\14\00") (func $kitchensink (type $0) (result i32) (block $label$0 (result i32) diff --git a/test/kitchen_sink.wast.fromBinary.noDebugInfo b/test/kitchen_sink.wast.fromBinary.noDebugInfo index 4197963747b..4491d80483c 100644 --- a/test/kitchen_sink.wast.fromBinary.noDebugInfo +++ b/test/kitchen_sink.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (memory $0 4096 4096 notshared) + (memory $0 4096 4096) (data (i32.const 1026) "\14\00") (func $0 (type $0) (result i32) (block $label$0 (result i32) diff --git a/test/llvm_autogenerated/byval.wast b/test/llvm_autogenerated/byval.wast index 6ac30d9e6a3..cd9b3933431 100644 --- a/test/llvm_autogenerated/byval.wast +++ b/test/llvm_autogenerated/byval.wast @@ -9,7 +9,7 @@ (import "env" "ext_func" (func $ext_func (param i32))) (import "env" "ext_func_empty" (func $ext_func_empty (param i32))) (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/call.wast b/test/llvm_autogenerated/call.wast index 43021d3f7a9..1f3cbb253f2 100644 --- a/test/llvm_autogenerated/call.wast +++ b/test/llvm_autogenerated/call.wast @@ -14,7 +14,7 @@ (import "env" "i32_unary" (func $i32_unary (param i32) (result i32))) (import "env" "i64_nullary" (func $i64_nullary (result i64))) (import "env" "void_nullary" (func $void_nullary)) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast index 9b76291bc7d..910c29f1a89 100644 --- a/test/llvm_autogenerated/cfg-stackify.wast +++ b/test/llvm_autogenerated/cfg-stackify.wast @@ -6,7 +6,7 @@ (import "env" "something" (func $something)) (import "env" "test15_callee0" (func $test15_callee0)) (import "env" "test15_callee1" (func $test15_callee1)) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_f32.wast b/test/llvm_autogenerated/comparisons_f32.wast index a71e0d8f8c3..0711f7bd4e7 100644 --- a/test/llvm_autogenerated/comparisons_f32.wast +++ b/test/llvm_autogenerated/comparisons_f32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_f64.wast b/test/llvm_autogenerated/comparisons_f64.wast index 3ff654b9496..2b256e57c03 100644 --- a/test/llvm_autogenerated/comparisons_f64.wast +++ b/test/llvm_autogenerated/comparisons_f64.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_i32.wast b/test/llvm_autogenerated/comparisons_i32.wast index fb884ce19de..4cac9bd73fc 100644 --- a/test/llvm_autogenerated/comparisons_i32.wast +++ b/test/llvm_autogenerated/comparisons_i32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/comparisons_i64.wast b/test/llvm_autogenerated/comparisons_i64.wast index 407a9ba8d63..213181dfbea 100644 --- a/test/llvm_autogenerated/comparisons_i64.wast +++ b/test/llvm_autogenerated/comparisons_i64.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/conv.wast b/test/llvm_autogenerated/conv.wast index 869c39748d4..f07ebecca35 100644 --- a/test/llvm_autogenerated/conv.wast +++ b/test/llvm_autogenerated/conv.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/copysign-casts.wast b/test/llvm_autogenerated/copysign-casts.wast index 0a78556e797..66cd3da0501 100644 --- a/test/llvm_autogenerated/copysign-casts.wast +++ b/test/llvm_autogenerated/copysign-casts.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) (type $FUNCSIG$fff (func (param f32 f32) (result f32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/cpus.wast b/test/llvm_autogenerated/cpus.wast index 6a0d88afafc..5d957835456 100644 --- a/test/llvm_autogenerated/cpus.wast +++ b/test/llvm_autogenerated/cpus.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/dead-vreg.wast b/test/llvm_autogenerated/dead-vreg.wast index 749e2f18725..1f81613021f 100644 --- a/test/llvm_autogenerated/dead-vreg.wast +++ b/test/llvm_autogenerated/dead-vreg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/divrem-constant.wast b/test/llvm_autogenerated/divrem-constant.wast index 6443c9be090..25a673cefeb 100644 --- a/test/llvm_autogenerated/divrem-constant.wast +++ b/test/llvm_autogenerated/divrem-constant.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/f32.wast b/test/llvm_autogenerated/f32.wast index f6174de2fe5..d62e4e046f4 100644 --- a/test/llvm_autogenerated/f32.wast +++ b/test/llvm_autogenerated/f32.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ffff (func (param f32 f32 f32) (result f32))) (import "env" "fmaf" (func $fmaf (param f32 f32 f32) (result f32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/f64.wast b/test/llvm_autogenerated/f64.wast index a2c8221a626..f3bcd3d8f2e 100644 --- a/test/llvm_autogenerated/f64.wast +++ b/test/llvm_autogenerated/f64.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$dddd (func (param f64 f64 f64) (result f64))) (import "env" "fma" (func $fma (param f64 f64 f64) (result f64))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/fast-isel-noreg.wast b/test/llvm_autogenerated/fast-isel-noreg.wast index dee038ed85a..82486303bb1 100644 --- a/test/llvm_autogenerated/fast-isel-noreg.wast +++ b/test/llvm_autogenerated/fast-isel-noreg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/fast-isel.wast b/test/llvm_autogenerated/fast-isel.wast index 4a40993654b..9bc1fb44c4c 100644 --- a/test/llvm_autogenerated/fast-isel.wast +++ b/test/llvm_autogenerated/fast-isel.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/frem.wast b/test/llvm_autogenerated/frem.wast index a96ba03253e..31ba4bb50f6 100644 --- a/test/llvm_autogenerated/frem.wast +++ b/test/llvm_autogenerated/frem.wast @@ -3,7 +3,7 @@ (type $FUNCSIG$fff (func (param f32 f32) (result f32))) (import "env" "fmod" (func $fmod (param f64 f64) (result f64))) (import "env" "fmodf" (func $fmodf (param f32 f32) (result f32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/func.wast b/test/llvm_autogenerated/func.wast index f090a5f1bd7..dbd9c39abe2 100644 --- a/test/llvm_autogenerated/func.wast +++ b/test/llvm_autogenerated/func.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast index 362553f7c4c..ccf0da15f83 100644 --- a/test/llvm_autogenerated/global.wast +++ b/test/llvm_autogenerated/global.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\b0\08\00\00") (data (i32.const 12) "9\05\00\00") diff --git a/test/llvm_autogenerated/globl.wast b/test/llvm_autogenerated/globl.wast index 8fc518fca38..b3c547bdb60 100644 --- a/test/llvm_autogenerated/globl.wast +++ b/test/llvm_autogenerated/globl.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i128.wast b/test/llvm_autogenerated/i128.wast index 068bdf8075e..3cc5c0aae9d 100644 --- a/test/llvm_autogenerated/i128.wast +++ b/test/llvm_autogenerated/i128.wast @@ -9,7 +9,7 @@ (import "env" "__multi3" (func $__multi3 (param i32 i64 i64 i64 i64))) (import "env" "__udivti3" (func $__udivti3 (param i32 i64 i64 i64 i64))) (import "env" "__umodti3" (func $__umodti3 (param i32 i64 i64 i64 i64))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i32-load-store-alignment.wast b/test/llvm_autogenerated/i32-load-store-alignment.wast index fb432a640e9..c084dd3fac6 100644 --- a/test/llvm_autogenerated/i32-load-store-alignment.wast +++ b/test/llvm_autogenerated/i32-load-store-alignment.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i32.wast b/test/llvm_autogenerated/i32.wast index e2cf23ec887..2ee13f2c3da 100644 --- a/test/llvm_autogenerated/i32.wast +++ b/test/llvm_autogenerated/i32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i64-load-store-alignment.wast b/test/llvm_autogenerated/i64-load-store-alignment.wast index 1ea70493ce4..5d3d4e9632d 100644 --- a/test/llvm_autogenerated/i64-load-store-alignment.wast +++ b/test/llvm_autogenerated/i64-load-store-alignment.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/i64.wast b/test/llvm_autogenerated/i64.wast index 66e04b9f9c8..2ffbfc9643e 100644 --- a/test/llvm_autogenerated/i64.wast +++ b/test/llvm_autogenerated/i64.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/ident.wast b/test/llvm_autogenerated/ident.wast index 5e22fcb4360..071206e3b6c 100644 --- a/test/llvm_autogenerated/ident.wast +++ b/test/llvm_autogenerated/ident.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/immediates.wast b/test/llvm_autogenerated/immediates.wast index 92aac5fcc7e..6dce33aeb5d 100644 --- a/test/llvm_autogenerated/immediates.wast +++ b/test/llvm_autogenerated/immediates.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/indirect-import.wast b/test/llvm_autogenerated/indirect-import.wast index ef8eeaa5d33..f8269e80a39 100644 --- a/test/llvm_autogenerated/indirect-import.wast +++ b/test/llvm_autogenerated/indirect-import.wast @@ -8,7 +8,7 @@ (import "env" "extern_ijidf" (func $extern_ijidf (param i64 i32 f64 f32) (result i32))) (import "env" "extern_v" (func $extern_v)) (import "env" "extern_vj" (func $extern_vj (param i64))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (import "env" "extern_fd" (func $extern_fd (param f64) (result f32))) (import "env" "extern_struct" (func $extern_struct (param i32))) (import "env" "extern_sret" (func $extern_sret (param i32))) diff --git a/test/llvm_autogenerated/irreducible-cfg.wast b/test/llvm_autogenerated/irreducible-cfg.wast index 3eb44af2d4c..e01218f1b3c 100644 --- a/test/llvm_autogenerated/irreducible-cfg.wast +++ b/test/llvm_autogenerated/irreducible-cfg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast index fa6bc2ebe55..b3306d42479 100644 --- a/test/llvm_autogenerated/legalize.wast +++ b/test/llvm_autogenerated/legalize.wast @@ -2,7 +2,7 @@ (type $FUNCSIG$vijji (func (param i32 i64 i64 i32))) (import "env" "__ashlti3" (func $__ashlti3 (param i32 i64 i64 i32))) (import "env" "__lshrti3" (func $__lshrti3 (param i32 i64 i64 i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/load-ext.wast b/test/llvm_autogenerated/load-ext.wast index 3caa70017c2..768d5e53959 100644 --- a/test/llvm_autogenerated/load-ext.wast +++ b/test/llvm_autogenerated/load-ext.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/load-store-i1.wast b/test/llvm_autogenerated/load-store-i1.wast index 4cf850378a5..94dc055944f 100644 --- a/test/llvm_autogenerated/load-store-i1.wast +++ b/test/llvm_autogenerated/load-store-i1.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/load.wast b/test/llvm_autogenerated/load.wast index cecb6a24ffa..20b3bcf68fa 100644 --- a/test/llvm_autogenerated/load.wast +++ b/test/llvm_autogenerated/load.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast index a02fa5ebd5f..becf166b941 100644 --- a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast +++ b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast @@ -10,7 +10,7 @@ (import "env" "invoke_v" (func $invoke_v (param i32))) (import "env" "longjmp" (func $longjmp (param i32 i32))) (import "env" "setjmp" (func $setjmp (param i32) (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (import "env" "foo" (func $foo)) (table 2 2 anyfunc) (elem (i32.const 0) $__wasm_nullptr $__importThunk_foo) diff --git a/test/llvm_autogenerated/mem-intrinsics.wast b/test/llvm_autogenerated/mem-intrinsics.wast index c1786979ded..8707407bd74 100644 --- a/test/llvm_autogenerated/mem-intrinsics.wast +++ b/test/llvm_autogenerated/mem-intrinsics.wast @@ -7,7 +7,7 @@ (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32))) (import "env" "memmove" (func $memmove (param i32 i32 i32) (result i32))) (import "env" "memset" (func $memset (param i32 i32 i32) (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/memory-addr32.wast b/test/llvm_autogenerated/memory-addr32.wast index ab7675b53cd..b81880a6e19 100644 --- a/test/llvm_autogenerated/memory-addr32.wast +++ b/test/llvm_autogenerated/memory-addr32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/negative-base-reg.wast b/test/llvm_autogenerated/negative-base-reg.wast index b08fe840c26..b3f17724cbc 100644 --- a/test/llvm_autogenerated/negative-base-reg.wast +++ b/test/llvm_autogenerated/negative-base-reg.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\90\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/non-executable-stack.wast b/test/llvm_autogenerated/non-executable-stack.wast index 5e22fcb4360..071206e3b6c 100644 --- a/test/llvm_autogenerated/non-executable-stack.wast +++ b/test/llvm_autogenerated/non-executable-stack.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/offset.wast b/test/llvm_autogenerated/offset.wast index 8f03de15abe..1d6e903a71e 100644 --- a/test/llvm_autogenerated/offset.wast +++ b/test/llvm_autogenerated/offset.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (data (i32.const 12) "\00\00\00\00") diff --git a/test/llvm_autogenerated/phi.wast b/test/llvm_autogenerated/phi.wast index 8a3f36da3d8..3ed5e4409eb 100644 --- a/test/llvm_autogenerated/phi.wast +++ b/test/llvm_autogenerated/phi.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast index 51be796c917..4917dacc29a 100644 --- a/test/llvm_autogenerated/reg-stackify.wast +++ b/test/llvm_autogenerated/reg-stackify.wast @@ -17,7 +17,7 @@ (import "env" "use_a" (func $use_a (param i32))) (import "env" "use_b" (func $use_b (param i32))) (import "env" "use_memory" (func $use_memory (param i32) (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (data (i32.const 12) "\00\00\00\00") diff --git a/test/llvm_autogenerated/return-int32.wast b/test/llvm_autogenerated/return-int32.wast index 20b0938f7d0..658133704c7 100644 --- a/test/llvm_autogenerated/return-int32.wast +++ b/test/llvm_autogenerated/return-int32.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/return-void.wast b/test/llvm_autogenerated/return-void.wast index 6fc01d3189d..09da984a61c 100644 --- a/test/llvm_autogenerated/return-void.wast +++ b/test/llvm_autogenerated/return-void.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/select.wast b/test/llvm_autogenerated/select.wast index a761d1644c6..f49a78c8ad1 100644 --- a/test/llvm_autogenerated/select.wast +++ b/test/llvm_autogenerated/select.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/signext-zeroext.wast b/test/llvm_autogenerated/signext-zeroext.wast index 6dc93d6c157..383af3908c8 100644 --- a/test/llvm_autogenerated/signext-zeroext.wast +++ b/test/llvm_autogenerated/signext-zeroext.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/store-trunc.wast b/test/llvm_autogenerated/store-trunc.wast index 00689396405..b33660666ef 100644 --- a/test/llvm_autogenerated/store-trunc.wast +++ b/test/llvm_autogenerated/store-trunc.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/store.wast b/test/llvm_autogenerated/store.wast index 8e80f645664..f1496dd1f46 100644 --- a/test/llvm_autogenerated/store.wast +++ b/test/llvm_autogenerated/store.wast @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/switch.wast b/test/llvm_autogenerated/switch.wast index b75db6537c9..43dbf2b99c4 100644 --- a/test/llvm_autogenerated/switch.wast +++ b/test/llvm_autogenerated/switch.wast @@ -6,7 +6,7 @@ (import "env" "foo3" (func $foo3)) (import "env" "foo4" (func $foo4)) (import "env" "foo5" (func $foo5)) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/unreachable.wast b/test/llvm_autogenerated/unreachable.wast index 81ddf82dda7..fc775b2c2aa 100644 --- a/test/llvm_autogenerated/unreachable.wast +++ b/test/llvm_autogenerated/unreachable.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$v (func)) (import "env" "abort" (func $abort)) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/unused-argument.wast b/test/llvm_autogenerated/unused-argument.wast index e64d29cbe08..2cfb37f4748 100644 --- a/test/llvm_autogenerated/unused-argument.wast +++ b/test/llvm_autogenerated/unused-argument.wast @@ -1,7 +1,7 @@ (module (type $FUNCSIG$i (func (result i32))) (import "env" "return_something" (func $return_something (result i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast index 0814c7295ec..be1ada7a69c 100644 --- a/test/llvm_autogenerated/userstack.wast +++ b/test/llvm_autogenerated/userstack.wast @@ -3,7 +3,7 @@ (import "env" "ext_func" (func $ext_func (param i32))) (import "env" "ext_func_i32" (func $ext_func_i32 (param i32))) (import "env" "use_i8_star" (func $use_i8_star (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast index d7d9e2b0e4e..96fc57cafee 100644 --- a/test/llvm_autogenerated/varargs.wast +++ b/test/llvm_autogenerated/varargs.wast @@ -2,7 +2,7 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$vi (func (param i32))) (import "env" "callee" (func $callee (param i32))) - (import "env" "memory" (memory $0 1 notshared)) + (import "env" "memory" (memory $0 1)) (table 0 anyfunc) (data (i32.const 4) "\10\04\00\00") (export "stackSave" (func $stackSave)) diff --git a/test/memory-import.wast.from-wast b/test/memory-import.wast.from-wast index c2f449bd865..70fc97057b9 100644 --- a/test/memory-import.wast.from-wast +++ b/test/memory-import.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (import "env" "memory" (memory $0 1 1 notshared)) + (import "env" "memory" (memory $0 1 1)) (func $foo (type $0) (result i32) (i32.load offset=13 (i32.const 37) diff --git a/test/memory-import.wast.fromBinary b/test/memory-import.wast.fromBinary index 502faa79607..b83ca836aac 100644 --- a/test/memory-import.wast.fromBinary +++ b/test/memory-import.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (import "env" "memory" (memory $0 1 1 notshared)) + (import "env" "memory" (memory $0 1 1)) (func $foo (type $0) (result i32) (i32.load offset=13 (i32.const 37) diff --git a/test/memory-import.wast.fromBinary.noDebugInfo b/test/memory-import.wast.fromBinary.noDebugInfo index b229201a058..d80f6c2b087 100644 --- a/test/memory-import.wast.fromBinary.noDebugInfo +++ b/test/memory-import.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func (result i32))) - (import "env" "memory" (memory $0 1 1 notshared)) + (import "env" "memory" (memory $0 1 1)) (func $0 (type $0) (result i32) (i32.load offset=13 (i32.const 37) diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm index a58db669842..a6d77f5cf44 100644 --- a/test/memorygrowth.fromasm +++ b/test/memorygrowth.fromasm @@ -19,7 +19,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.clamp b/test/memorygrowth.fromasm.clamp index a58db669842..a6d77f5cf44 100644 --- a/test/memorygrowth.fromasm.clamp +++ b/test/memorygrowth.fromasm.clamp @@ -19,7 +19,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.clamp.no-opts b/test/memorygrowth.fromasm.clamp.no-opts index e65f774ec7e..490c479c072 100644 --- a/test/memorygrowth.fromasm.clamp.no-opts +++ b/test/memorygrowth.fromasm.clamp.no-opts @@ -23,7 +23,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise index dae539bba9a..bd959d564f3 100644 --- a/test/memorygrowth.fromasm.imprecise +++ b/test/memorygrowth.fromasm.imprecise @@ -19,7 +19,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts index 851afafd7a5..f2e0cc64460 100644 --- a/test/memorygrowth.fromasm.imprecise.no-opts +++ b/test/memorygrowth.fromasm.imprecise.no-opts @@ -23,7 +23,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts index e65f774ec7e..490c479c072 100644 --- a/test/memorygrowth.fromasm.no-opts +++ b/test/memorygrowth.fromasm.no-opts @@ -23,7 +23,7 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/merge/basics.wast.combined b/test/merge/basics.wast.combined index 2fa2824c0f0..f0654ec7a7d 100644 --- a/test/merge/basics.wast.combined +++ b/test/merge/basics.wast.combined @@ -5,7 +5,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 10 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized index f7e8afea0e2..7637b787b75 100644 --- a/test/merge/basics.wast.combined.finalized +++ b/test/merge/basics.wast.combined.finalized @@ -5,7 +5,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 18 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt index 76c5f7efa55..119851fb05b 100644 --- a/test/merge/basics.wast.combined.finalized.opt +++ b/test/merge/basics.wast.combined.finalized.opt @@ -1,7 +1,7 @@ (module (type $ii (func (param i32 i32))) (type $FUNCSIG$v (func)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 18 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/basics.wast.combined.opt b/test/merge/basics.wast.combined.opt index c9a21ba89a7..c595d00da29 100644 --- a/test/merge/basics.wast.combined.opt +++ b/test/merge/basics.wast.combined.opt @@ -3,7 +3,7 @@ (type $FUNCSIG$v (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 10 anyfunc)) (import "env" "some-func" (func $some-func)) (import "env" "some-collide" (func $some-collide)) diff --git a/test/merge/dylib.wasm.combined b/test/merge/dylib.wasm.combined index 5658328be24..71df6735691 100644 --- a/test/merge/dylib.wasm.combined +++ b/test/merge/dylib.wasm.combined @@ -8,7 +8,7 @@ (type $2$0 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (import "env" "memoryBase" (global $import$0$0 i32)) diff --git a/test/merge/dylib.wasm.combined.finalized b/test/merge/dylib.wasm.combined.finalized index 617bb0ddea3..2ef9ed1350b 100644 --- a/test/merge/dylib.wasm.combined.finalized +++ b/test/merge/dylib.wasm.combined.finalized @@ -8,7 +8,7 @@ (type $2$0 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (import "env" "memoryBase" (global $import$0$0 i32)) diff --git a/test/merge/dylib.wasm.combined.finalized.opt b/test/merge/dylib.wasm.combined.finalized.opt index 552a1fe3cbd..41a24ce30a4 100644 --- a/test/merge/dylib.wasm.combined.finalized.opt +++ b/test/merge/dylib.wasm.combined.finalized.opt @@ -3,7 +3,7 @@ (type $2 (func (result i32))) (type $3 (func)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (global $global$0 (mut i32) (i32.const 0)) (global $global$1 (mut i32) (i32.const 0)) diff --git a/test/merge/dylib.wasm.combined.opt b/test/merge/dylib.wasm.combined.opt index a79b7388124..351d05b4161 100644 --- a/test/merge/dylib.wasm.combined.opt +++ b/test/merge/dylib.wasm.combined.opt @@ -4,7 +4,7 @@ (type $3 (func)) (import "env" "memoryBase" (global $import$0 i32)) (import "env" "_puts" (func $import$1 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (import "env" "tableBase" (global $import$4 i32)) (import "env" "memoryBase" (global $import$0$0 i32)) diff --git a/test/merge/fusing.wast.combined b/test/merge/fusing.wast.combined index f9138ded692..2a7adf6e297 100644 --- a/test/merge/fusing.wast.combined +++ b/test/merge/fusing.wast.combined @@ -3,7 +3,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/fusing.wast.combined.finalized b/test/merge/fusing.wast.combined.finalized index 7cdb18cc97b..7896e448daf 100644 --- a/test/merge/fusing.wast.combined.finalized +++ b/test/merge/fusing.wast.combined.finalized @@ -3,7 +3,7 @@ (type $FUNCSIG$v$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/fusing.wast.combined.finalized.opt b/test/merge/fusing.wast.combined.finalized.opt index 860e25db786..9df0a5cdcfb 100644 --- a/test/merge/fusing.wast.combined.finalized.opt +++ b/test/merge/fusing.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $FUNCSIG$v (func)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (global $a-global i32 (i32.const 0)) (global $b-global f64 (f64.const 2.14281428)) diff --git a/test/merge/fusing.wast.combined.opt b/test/merge/fusing.wast.combined.opt index df102522eea..c8d58890e98 100644 --- a/test/merge/fusing.wast.combined.opt +++ b/test/merge/fusing.wast.combined.opt @@ -2,7 +2,7 @@ (type $FUNCSIG$v (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (global $a-global i32 (i32.const 0)) (global $b-global f64 (f64.const 2.14281428)) diff --git a/test/merge/global-init.wast.combined b/test/merge/global-init.wast.combined index ac4cb799546..95b33996865 100644 --- a/test/merge/global-init.wast.combined +++ b/test/merge/global-init.wast.combined @@ -1,7 +1,7 @@ (module (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) diff --git a/test/merge/global-init.wast.combined.finalized b/test/merge/global-init.wast.combined.finalized index 8e4c77986aa..40a5066fac9 100644 --- a/test/merge/global-init.wast.combined.finalized +++ b/test/merge/global-init.wast.combined.finalized @@ -1,7 +1,7 @@ (module (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) diff --git a/test/merge/global-init.wast.combined.finalized.opt b/test/merge/global-init.wast.combined.finalized.opt index 376aceeb6a4..02a0900f547 100644 --- a/test/merge/global-init.wast.combined.finalized.opt +++ b/test/merge/global-init.wast.combined.finalized.opt @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) ) diff --git a/test/merge/global-init.wast.combined.opt b/test/merge/global-init.wast.combined.opt index 649c810f1b7..44c047693a7 100644 --- a/test/merge/global-init.wast.combined.opt +++ b/test/merge/global-init.wast.combined.opt @@ -1,7 +1,7 @@ (module (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (data (get_global $memoryBase) "") diff --git a/test/merge/main-lacks-segments.wast.combined b/test/merge/main-lacks-segments.wast.combined index cd58c5a224b..33eb89435f3 100644 --- a/test/merge/main-lacks-segments.wast.combined +++ b/test/merge/main-lacks-segments.wast.combined @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 2 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/main-lacks-segments.wast.combined.finalized b/test/merge/main-lacks-segments.wast.combined.finalized index cc7036171d6..923ffd34d15 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized +++ b/test/merge/main-lacks-segments.wast.combined.finalized @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 10 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/main-lacks-segments.wast.combined.finalized.opt b/test/merge/main-lacks-segments.wast.combined.finalized.opt index 8b7816354ab..0aeb4c62deb 100644 --- a/test/merge/main-lacks-segments.wast.combined.finalized.opt +++ b/test/merge/main-lacks-segments.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 10 anyfunc)) (elem (i32.const 8) $foo $foo) (data (i32.const 1024) "hello, this is some data!") diff --git a/test/merge/main-lacks-segments.wast.combined.opt b/test/merge/main-lacks-segments.wast.combined.opt index f16c6e960b4..4ea294a8e22 100644 --- a/test/merge/main-lacks-segments.wast.combined.opt +++ b/test/merge/main-lacks-segments.wast.combined.opt @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 2 anyfunc)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) diff --git a/test/merge/post-instantiate-a.wast.combined b/test/merge/post-instantiate-a.wast.combined index 88c3a65b9e7..725e1df287e 100644 --- a/test/merge/post-instantiate-a.wast.combined +++ b/test/merge/post-instantiate-a.wast.combined @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 0 notshared) + (memory $0 0) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-a.wast.combined.finalized b/test/merge/post-instantiate-a.wast.combined.finalized index 8bef63ea638..e50f84e7997 100644 --- a/test/merge/post-instantiate-a.wast.combined.finalized +++ b/test/merge/post-instantiate-a.wast.combined.finalized @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 1 notshared) + (memory $0 1) (data (i32.const 1024) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-a.wast.combined.finalized.opt b/test/merge/post-instantiate-a.wast.combined.finalized.opt index b4c76204119..d0a9b4a6a06 100644 --- a/test/merge/post-instantiate-a.wast.combined.finalized.opt +++ b/test/merge/post-instantiate-a.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 1 notshared) + (memory $0 1) (data (i32.const 1024) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-a.wast.combined.opt b/test/merge/post-instantiate-a.wast.combined.opt index 5caad875739..b4ecf737b1f 100644 --- a/test/merge/post-instantiate-a.wast.combined.opt +++ b/test/merge/post-instantiate-a.wast.combined.opt @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (memory $0 0 notshared) + (memory $0 0) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-b.wast.combined b/test/merge/post-instantiate-b.wast.combined index bf98c34a4a8..df4bfe76d51 100644 --- a/test/merge/post-instantiate-b.wast.combined +++ b/test/merge/post-instantiate-b.wast.combined @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 0 notshared) + (memory $0 0) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0$0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-b.wast.combined.finalized b/test/merge/post-instantiate-b.wast.combined.finalized index d3f47ebc57c..a6f2d309b50 100644 --- a/test/merge/post-instantiate-b.wast.combined.finalized +++ b/test/merge/post-instantiate-b.wast.combined.finalized @@ -5,7 +5,7 @@ (import "env" "tableBase" (global $tableBase i32)) (import "env" "memoryBase" (global $memoryBase$0 i32)) (import "env" "tableBase" (global $tableBase$0 i32)) - (memory $0 1 notshared) + (memory $0 1) (data (i32.const 1024) "") (export "__post_instantiate" (func $0$0)) (func $0 (type $0) diff --git a/test/merge/post-instantiate-b.wast.combined.finalized.opt b/test/merge/post-instantiate-b.wast.combined.finalized.opt index 567093ac8f6..367bd834b2c 100644 --- a/test/merge/post-instantiate-b.wast.combined.finalized.opt +++ b/test/merge/post-instantiate-b.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $0$0 (func)) - (memory $0 1 notshared) + (memory $0 1) (data (i32.const 1024) "") (export "__post_instantiate" (func $0$0)) (func $0$0 (type $0$0) diff --git a/test/merge/post-instantiate-b.wast.combined.opt b/test/merge/post-instantiate-b.wast.combined.opt index 92a9110a1f1..b847fc5e876 100644 --- a/test/merge/post-instantiate-b.wast.combined.opt +++ b/test/merge/post-instantiate-b.wast.combined.opt @@ -2,7 +2,7 @@ (type $0$0 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (memory $0 0 notshared) + (memory $0 0) (data (get_global $memoryBase) "") (export "__post_instantiate" (func $0$0)) (func $0$0 (type $0$0) diff --git a/test/merge/printf.wast.combined b/test/merge/printf.wast.combined index 58540cc3456..f8dcc3d0c53 100644 --- a/test/merge/printf.wast.combined +++ b/test/merge/printf.wast.combined @@ -4,7 +4,7 @@ (type $1 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) diff --git a/test/merge/printf.wast.combined.finalized b/test/merge/printf.wast.combined.finalized index 0f663cf7686..c72f0d28f94 100644 --- a/test/merge/printf.wast.combined.finalized +++ b/test/merge/printf.wast.combined.finalized @@ -4,7 +4,7 @@ (type $1 (func)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (import "env" "globally" (global $i-collide i32)) (import "env" "foobar" (func $import$8 (param i32 i32) (result i32))) diff --git a/test/merge/printf.wast.combined.finalized.opt b/test/merge/printf.wast.combined.finalized.opt index f7c888862c8..a801ab875c6 100644 --- a/test/merge/printf.wast.combined.finalized.opt +++ b/test/merge/printf.wast.combined.finalized.opt @@ -1,6 +1,6 @@ (module (type $FUNCSIG$iii (func (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 8 anyfunc)) (export "_printf" (func $625)) diff --git a/test/merge/printf.wast.combined.opt b/test/merge/printf.wast.combined.opt index 4779be0256f..ae913e40e4c 100644 --- a/test/merge/printf.wast.combined.opt +++ b/test/merge/printf.wast.combined.opt @@ -2,7 +2,7 @@ (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (data (get_global $memoryBase) "") diff --git a/test/min.fromasm b/test/min.fromasm index 49c92882749..d52aac5d3d3 100644 --- a/test/min.fromasm +++ b/test/min.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.clamp b/test/min.fromasm.clamp index 49c92882749..d52aac5d3d3 100644 --- a/test/min.fromasm.clamp +++ b/test/min.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.clamp.no-opts b/test/min.fromasm.clamp.no-opts index ee7f8290868..d0cc78eb04a 100644 --- a/test/min.fromasm.clamp.no-opts +++ b/test/min.fromasm.clamp.no-opts @@ -1,6 +1,6 @@ (module (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.imprecise b/test/min.fromasm.imprecise index da246a09ad0..aabb1e3a5d3 100644 --- a/test/min.fromasm.imprecise +++ b/test/min.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.imprecise.no-opts b/test/min.fromasm.imprecise.no-opts index ee7f8290868..d0cc78eb04a 100644 --- a/test/min.fromasm.imprecise.no-opts +++ b/test/min.fromasm.imprecise.no-opts @@ -1,6 +1,6 @@ (module (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.fromasm.no-opts b/test/min.fromasm.no-opts index ee7f8290868..d0cc78eb04a 100644 --- a/test/min.fromasm.no-opts +++ b/test/min.fromasm.no-opts @@ -1,6 +1,6 @@ (module (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/min.wast.from-wast b/test/min.wast.from-wast index c3fab650388..8942f2ff4ef 100644 --- a/test/min.wast.from-wast +++ b/test/min.wast.from-wast @@ -3,7 +3,7 @@ (type $1 (func (param i32 i32) (result f32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32 i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "floats" (func $floats)) (func $floats (type $0) (param $f f32) (result f32) (local $t f32) diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary index 243d7c2adff..b39388c462b 100644 --- a/test/min.wast.fromBinary +++ b/test/min.wast.fromBinary @@ -3,7 +3,7 @@ (type $1 (func (param i32 i32) (result f32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32 i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "floats" (func $floats)) (func $floats (type $0) (param $var$0 f32) (result f32) (local $var$1 f32) diff --git a/test/min.wast.fromBinary.noDebugInfo b/test/min.wast.fromBinary.noDebugInfo index bc589cd27c8..d6ad4be8540 100644 --- a/test/min.wast.fromBinary.noDebugInfo +++ b/test/min.wast.fromBinary.noDebugInfo @@ -3,7 +3,7 @@ (type $1 (func (param i32 i32) (result f32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32 i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "floats" (func $0)) (func $0 (type $0) (param $var$0 f32) (result f32) (local $var$1 f32) diff --git a/test/noffi_f32.fromasm b/test/noffi_f32.fromasm index 58edcb1c7b8..4236c215fd8 100644 --- a/test/noffi_f32.fromasm +++ b/test/noffi_f32.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.clamp b/test/noffi_f32.fromasm.clamp index 58edcb1c7b8..4236c215fd8 100644 --- a/test/noffi_f32.fromasm.clamp +++ b/test/noffi_f32.fromasm.clamp @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.clamp.no-opts b/test/noffi_f32.fromasm.clamp.no-opts index eea21043fda..3e6d142c000 100644 --- a/test/noffi_f32.fromasm.clamp.no-opts +++ b/test/noffi_f32.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.imprecise b/test/noffi_f32.fromasm.imprecise index 2cec94798f9..5553a036aa8 100644 --- a/test/noffi_f32.fromasm.imprecise +++ b/test/noffi_f32.fromasm.imprecise @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.imprecise.no-opts b/test/noffi_f32.fromasm.imprecise.no-opts index eea21043fda..3e6d142c000 100644 --- a/test/noffi_f32.fromasm.imprecise.no-opts +++ b/test/noffi_f32.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_f32.fromasm.no-opts b/test/noffi_f32.fromasm.no-opts index eea21043fda..3e6d142c000 100644 --- a/test/noffi_f32.fromasm.no-opts +++ b/test/noffi_f32.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ff (func (param f32) (result f32))) (import "env" "_importf" (func $importf (param f32) (result f32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm b/test/noffi_i64.fromasm index b4ef86c5e5b..65aacd9d310 100644 --- a/test/noffi_i64.fromasm +++ b/test/noffi_i64.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.clamp b/test/noffi_i64.fromasm.clamp index b4ef86c5e5b..65aacd9d310 100644 --- a/test/noffi_i64.fromasm.clamp +++ b/test/noffi_i64.fromasm.clamp @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.clamp.no-opts b/test/noffi_i64.fromasm.clamp.no-opts index b0028575289..f6fd6545456 100644 --- a/test/noffi_i64.fromasm.clamp.no-opts +++ b/test/noffi_i64.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.imprecise b/test/noffi_i64.fromasm.imprecise index 1e1f065f946..925e2986233 100644 --- a/test/noffi_i64.fromasm.imprecise +++ b/test/noffi_i64.fromasm.imprecise @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.imprecise.no-opts b/test/noffi_i64.fromasm.imprecise.no-opts index b0028575289..f6fd6545456 100644 --- a/test/noffi_i64.fromasm.imprecise.no-opts +++ b/test/noffi_i64.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/noffi_i64.fromasm.no-opts b/test/noffi_i64.fromasm.no-opts index b0028575289..f6fd6545456 100644 --- a/test/noffi_i64.fromasm.no-opts +++ b/test/noffi_i64.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$jj (func (param i64) (result i64))) (import "env" "_importll" (func $importll (param i64) (result i64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/passes/O.bin.txt b/test/passes/O.bin.txt index 91e09636517..9c68478ac6b 100644 --- a/test/passes/O.bin.txt +++ b/test/passes/O.bin.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i64) (result i64))) - (memory $0 0 notshared) + (memory $0 0) (export "fac-rec" (func $0)) (export "fac-rec-named" (func $1)) (export "fac-iter" (func $2)) diff --git a/test/passes/O.txt b/test/passes/O.txt index f3fa5200fb9..4b340dcd73e 100644 --- a/test/passes/O.txt +++ b/test/passes/O.txt @@ -1,7 +1,7 @@ (module (type $0 (func (result i32))) (type $1 (func (param i64))) - (memory $0 0 notshared) + (memory $0 0) (export "ret" (func $ret)) (export "waka" (func $if-0-unreachable-to-none)) (func $ret (type $0) (result i32) diff --git a/test/passes/Oz.txt b/test/passes/Oz.txt index de468adc67f..c6710632642 100644 --- a/test/passes/Oz.txt +++ b/test/passes/Oz.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32 i32) (result i32))) (type $1 (func (param i32) (result i32))) - (memory $0 100 100 notshared) + (memory $0 100 100) (export "localcse" (func $basics)) (export "localcse-2" (func $8)) (func $basics (type $0) (param $0 i32) (param $1 i32) (result i32) diff --git a/test/passes/coalesce-locals-learning.txt b/test/passes/coalesce-locals-learning.txt index 2e66a74edd3..3bd04680d01 100644 --- a/test/passes/coalesce-locals-learning.txt +++ b/test/passes/coalesce-locals-learning.txt @@ -5,7 +5,7 @@ (type $3 (func (param i32 f32))) (type $4 (func (param i32))) (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32))) - (memory $0 10 notshared) + (memory $0 10) (func $nothing-to-do (type $2) (local $0 i32) (nop) diff --git a/test/passes/coalesce-locals.txt b/test/passes/coalesce-locals.txt index 50c562f3a0d..8f290815307 100644 --- a/test/passes/coalesce-locals.txt +++ b/test/passes/coalesce-locals.txt @@ -9,7 +9,7 @@ (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32))) (import "env" "get" (func $get (result i32))) (import "env" "set" (func $set (param i32))) - (memory $0 10 notshared) + (memory $0 10) (func $nothing-to-do (type $2) (local $0 i32) (nop) diff --git a/test/passes/code-pushing_ignore-implicit-traps.txt b/test/passes/code-pushing_ignore-implicit-traps.txt index 05ea9506589..b20bc49aac6 100644 --- a/test/passes/code-pushing_ignore-implicit-traps.txt +++ b/test/passes/code-pushing_ignore-implicit-traps.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $push1 (type $0) (local $x i32) (block $out diff --git a/test/passes/dce.txt b/test/passes/dce.txt index 57d0e35ecff..3597d59ae09 100644 --- a/test/passes/dce.txt +++ b/test/passes/dce.txt @@ -7,7 +7,7 @@ (global $x (mut i32) (i32.const 0)) (table 1 1 anyfunc) (elem (i32.const 0) $call-me) - (memory $0 10 notshared) + (memory $0 10) (func $call-me (type $ii) (param $0 i32) (param $1 i32) (nop) ) diff --git a/test/passes/dce_vacuum.bin.txt b/test/passes/dce_vacuum.bin.txt index d536f979b42..d4be4d1f476 100644 --- a/test/passes/dce_vacuum.bin.txt +++ b/test/passes/dce_vacuum.bin.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param f32 f32) (result f32))) (type $1 (func (param f64 f64) (result f64))) - (memory $0 0 notshared) + (memory $0 0) (export "f32.compute_radix" (func $0)) (export "f64.compute_radix" (func $1)) (func $0 (type $0) (param $var$0 f32) (param $var$1 f32) (result f32) diff --git a/test/passes/dce_vacuum.txt b/test/passes/dce_vacuum.txt index 7e204c5960f..ac61cce04ec 100644 --- a/test/passes/dce_vacuum.txt +++ b/test/passes/dce_vacuum.txt @@ -2,7 +2,7 @@ (type $0 (func (result i32))) (type $1 (func (param f32 f32) (result f32))) (type $2 (func (param i64) (result i64))) - (memory $0 0 notshared) + (memory $0 0) (func $__Z12serveroptionPc (type $0) (result i32) (return (i32.const 0) diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt index 2292bacb44c..3ffe3b7bafb 100644 --- a/test/passes/duplicate-function-elimination.txt +++ b/test/passes/duplicate-function-elimination.txt @@ -1,13 +1,13 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (nop) ) ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (i32.const 0) @@ -19,7 +19,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (drop (i32.const 0) @@ -28,7 +28,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (i32.const 0) @@ -44,7 +44,7 @@ (type $0 (func)) (table 3 3 anyfunc) (elem (i32.const 0) $keep2 $keep2 $caller) - (memory $0 0 notshared) + (memory $0 0) (export "keep2" (func $keep2)) (export "other" (func $keep2)) (start $keep2) @@ -58,7 +58,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2-after-two-passes (type $0) (nop) ) @@ -68,7 +68,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep-4 (type $0) (nop) ) @@ -87,7 +87,7 @@ (type $S (func (result i32))) (type $2 (func)) (type $3 (func (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $keep4-similar-but-func-sig-differs (type $2) (drop (i32.const 0) @@ -108,7 +108,7 @@ (module (type $S (func (result i32))) (type $1 (func (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $keep2-similar-but-func-sig-differs (type $1) (param $i i32) (drop (i32.const 0) @@ -120,7 +120,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (nop) ) @@ -131,7 +131,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (block $block0 ) @@ -139,7 +139,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (block $block0 ) @@ -152,7 +152,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (block $block0 (nop) @@ -161,7 +161,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (block $block0 (nop) @@ -176,7 +176,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (block $block0 (nop) @@ -190,7 +190,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase-since-block-names-do-not-matter (type $0) (block $foo ) @@ -198,7 +198,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase-since-block-names-do-not-matter (type $0) (block $foo (br $foo) @@ -210,7 +210,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (block $foo (block $block @@ -234,7 +234,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (block $foo (br_if $foo @@ -252,7 +252,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (block $foo (br_if $foo @@ -263,7 +263,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (block $foo (br_table $foo $foo @@ -281,7 +281,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (loop $bar (nop) @@ -290,7 +290,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (block $foo (result i32) @@ -314,7 +314,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (block $foo (block $bar @@ -327,7 +327,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (block $foo (block $bar @@ -349,14 +349,14 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (call $erase) ) ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2-but-in-theory-we-could-erase (type $0) (call $keep2-but-in-theory-we-could-erase) ) @@ -368,7 +368,7 @@ (type $FUNCSIG$v (func)) (import "env" "i" (func $i)) (import "env" "j" (func $j)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $FUNCSIG$v) (call $i) ) @@ -377,7 +377,7 @@ (type $FUNCSIG$v (func)) (import "env" "i" (func $i)) (import "env" "j" (func $j)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $FUNCSIG$v) (call $i) ) @@ -389,7 +389,7 @@ (type $T (func)) (table 2 2 anyfunc) (elem (i32.const 0) $erase $erase) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $T) (call_indirect $T (i32.const 0) @@ -400,7 +400,7 @@ (type $T (func)) (table 2 2 anyfunc) (elem (i32.const 0) $keep2 $other) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $T) (call_indirect $T (i32.const 0) @@ -417,7 +417,7 @@ (type $S (func)) (table 2 2 anyfunc) (elem (i32.const 0) $keep2 $other) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $T) (call_indirect $T (i32.const 0) @@ -431,7 +431,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase-even-locals-with-different-names (type $0) (local $i i32) (drop @@ -441,7 +441,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (local $i i32) (drop @@ -457,7 +457,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase-even-locals-with-different-names (type $0) (local $i i32) (set_local $i @@ -467,7 +467,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (local $i i32) (set_local $i @@ -483,7 +483,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (local $i i32) (set_local $i @@ -499,7 +499,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $erase (type $0) (drop (i32.load @@ -515,7 +515,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (drop (i32.load offset=3 @@ -533,7 +533,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (drop (i32.load16_s offset=3 @@ -551,7 +551,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (drop (i32.load16_s @@ -569,7 +569,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (drop (i32.load16_s offset=3 @@ -587,7 +587,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (drop (i32.load16_u offset=3 @@ -605,7 +605,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $erase (type $0) (i32.store (i32.const 0) @@ -619,7 +619,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (i32.store offset=3 (i32.const 0) @@ -635,7 +635,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (i32.store16 offset=3 (i32.const 0) @@ -651,7 +651,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (i32.store16 (i32.const 0) @@ -667,7 +667,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (i32.store16 offset=3 (i32.const 0) @@ -683,7 +683,7 @@ ) (module (type $0 (func)) - (memory $0 10 notshared) + (memory $0 10) (func $keep2 (type $0) (i32.store16 offset=3 (i32.const 0) @@ -699,7 +699,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (i32.const 0) @@ -713,7 +713,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (i32.const 0) @@ -727,7 +727,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (i32.const 0) @@ -741,7 +741,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (i64.const 0) @@ -755,7 +755,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (f32.const 0.10000000149011612) @@ -769,7 +769,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (f64.const 0.1) @@ -783,7 +783,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (drop (f32.abs @@ -794,7 +794,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (f32.abs @@ -812,7 +812,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (f32.abs @@ -830,7 +830,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (drop (f32.add @@ -842,7 +842,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (f32.add @@ -862,7 +862,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (f32.add @@ -882,7 +882,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep2 (type $0) (drop (f32.add @@ -902,7 +902,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (drop (select @@ -915,7 +915,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep (type $0) (drop (select @@ -937,7 +937,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep (type $0) (drop (select @@ -959,7 +959,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep (type $0) (drop (select @@ -981,14 +981,14 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (return) ) ) (module (type $0 (func (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (result i32) (return (i32.const 0) @@ -997,7 +997,7 @@ ) (module (type $0 (func (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $keep (type $0) (result i32) (return (i32.const 0) @@ -1011,7 +1011,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (drop (current_memory) @@ -1020,7 +1020,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $erase (type $0) (drop (grow_memory @@ -1031,7 +1031,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep (type $0) (drop (grow_memory @@ -1049,7 +1049,7 @@ ) (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $keep (type $0) (drop (current_memory) diff --git a/test/passes/flatten-control-flow.bin.txt b/test/passes/flatten-control-flow.bin.txt index 1552c1ee49d..9b33f976e21 100644 --- a/test/passes/flatten-control-flow.bin.txt +++ b/test/passes/flatten-control-flow.bin.txt @@ -9,7 +9,7 @@ (type $7 (func (param f64) (result f64))) (type $8 (func (param i64 f32 f64 i32 i32))) (type $9 (func (param i64 f32 f64 i32 i32) (result f64))) - (memory $0 0 notshared) + (memory $0 0) (export "type-local-i32" (func $0)) (export "type-local-i64" (func $1)) (export "type-local-f32" (func $2)) diff --git a/test/passes/flatten-control-flow.txt b/test/passes/flatten-control-flow.txt index f8cc5cf1c34..d94536712b3 100644 --- a/test/passes/flatten-control-flow.txt +++ b/test/passes/flatten-control-flow.txt @@ -7,7 +7,7 @@ (global $x (mut i32) (i32.const 0)) (table 1 1 anyfunc) (elem (i32.const 0) $call-me) - (memory $0 10 notshared) + (memory $0 10) (func $call-me (type $ii) (param $0 i32) (param $1 i32) (nop) ) diff --git a/test/passes/inlining.txt b/test/passes/inlining.txt index b1868358e89..80ee3acf362 100644 --- a/test/passes/inlining.txt +++ b/test/passes/inlining.txt @@ -5,7 +5,7 @@ (type $3 (func (param f32 i64))) (table 1 1 anyfunc) (elem (i32.const 0) $tabled) - (memory $0 0 notshared) + (memory $0 0) (export "user" (func $user)) (export "exported" (func $exported)) (func $user (type $0) diff --git a/test/passes/instrument-locals.txt b/test/passes/instrument-locals.txt index 0d6f260c8aa..5cc8a98fefc 100644 --- a/test/passes/instrument-locals.txt +++ b/test/passes/instrument-locals.txt @@ -12,7 +12,7 @@ (import "instrument" "set_i64" (func $set_i64 (param i32 i32 i64) (result i64))) (import "instrument" "set_f32" (func $set_f32 (param i32 i32 f32) (result f32))) (import "instrument" "set_f64" (func $set_f64 (param i32 i32 f64) (result f64))) - (memory $0 0 notshared) + (memory $0 0) (func $A (type $0) (local $x i32) (local $y i64) diff --git a/test/passes/instrument-memory.txt b/test/passes/instrument-memory.txt index d69a9de1487..dd2e876d0a7 100644 --- a/test/passes/instrument-memory.txt +++ b/test/passes/instrument-memory.txt @@ -3,7 +3,7 @@ (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32))) (import "instrument" "load" (func $load (param i32 i32 i32 i32) (result i32))) (import "instrument" "store" (func $store (param i32 i32 i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $A (type $1) (drop (i32.load8_s diff --git a/test/passes/local-cse.txt b/test/passes/local-cse.txt index 4f27a965b09..34e7c9580eb 100644 --- a/test/passes/local-cse.txt +++ b/test/passes/local-cse.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (param i32) (result i32))) - (memory $0 100 100 notshared) + (memory $0 100 100) (func $basics (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/local-cse_ignore-implicit-traps.txt b/test/passes/local-cse_ignore-implicit-traps.txt index d8381f7c47b..8ad60b8ade3 100644 --- a/test/passes/local-cse_ignore-implicit-traps.txt +++ b/test/passes/local-cse_ignore-implicit-traps.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 100 100 notshared) + (memory $0 100 100) (func $loads (type $0) (local $0 i32) (drop diff --git a/test/passes/log-execution.txt b/test/passes/log-execution.txt index 572fee43fbe..32bbd88eb9c 100644 --- a/test/passes/log-execution.txt +++ b/test/passes/log-execution.txt @@ -3,7 +3,7 @@ (type $1 (func (result i32))) (type $FUNCSIG$vi (func (param i32))) (import "env" "log_execution" (func $log_execution (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $nopp (type $0) (call $log_execution (i32.const 0) diff --git a/test/passes/memory-packing.txt b/test/passes/memory-packing.txt index 91c8b49196d..6f67f9dcbdd 100644 --- a/test/passes/memory-packing.txt +++ b/test/passes/memory-packing.txt @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 2048 2048 notshared)) + (import "env" "memory" (memory $0 2048 2048)) (import "env" "memoryBase" (global $memoryBase i32)) (data (get_global $memoryBase) "waka this cannot be optimized\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00we don\'t know where it will go") (data (i32.const 1024) "waka this CAN be optimized") @@ -11,10 +11,10 @@ (data (i32.const 4066) "another\00but no") ) (module - (import "env" "memory" (memory $0 2048 2048 notshared)) + (import "env" "memory" (memory $0 2048 2048)) (import "env" "memoryBase" (global $memoryBase i32)) ) (module - (import "env" "memory" (memory $0 2048 2048 notshared)) + (import "env" "memory" (memory $0 2048 2048)) (import "env" "memoryBase" (global $memoryBase i32)) ) diff --git a/test/passes/merge-blocks.txt b/test/passes/merge-blocks.txt index 18d08cc0b95..33f16785a82 100644 --- a/test/passes/merge-blocks.txt +++ b/test/passes/merge-blocks.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $drop-block (type $0) (block $block (block $x diff --git a/test/passes/metrics.txt b/test/passes/metrics.txt index 3d0abd2162a..caf5f8a910d 100644 --- a/test/passes/metrics.txt +++ b/test/passes/metrics.txt @@ -14,7 +14,7 @@ Counts (global $glob i32 (i32.const 1337)) (table 256 256 anyfunc) (elem (i32.const 0) $ifs $ifs $ifs) - (memory $0 256 256 notshared) + (memory $0 256 256) (data (i32.const 0) "\ff\ef\0f\1f 0@P\99") (func $ifs (type $0) (param $x i32) (local $y f32) @@ -61,5 +61,5 @@ Counts [total] : 0 [vars] : 0 (module - (memory $0 0 notshared) + (memory $0 0) ) diff --git a/test/passes/nm.txt b/test/passes/nm.txt index cd5346464df..22e67cd8c73 100644 --- a/test/passes/nm.txt +++ b/test/passes/nm.txt @@ -3,7 +3,7 @@ $c : 13 (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $a (type $0) (nop) ) diff --git a/test/passes/optimize-instructions.txt b/test/passes/optimize-instructions.txt index 1cfd9eda648..c8fe17cf055 100644 --- a/test/passes/optimize-instructions.txt +++ b/test/passes/optimize-instructions.txt @@ -6,7 +6,7 @@ (type $4 (func (param i32 i32))) (type $5 (func (param i32))) (type $6 (func (param i32 i32) (result i32))) - (memory $0 0 notshared) + (memory $0 0) (export "load-off-2" (func $load-off-2)) (func $f (type $0) (param $i1 i32) (param $i2 i64) (if diff --git a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt b/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt index b985fb071a2..e2c4bb786a6 100644 --- a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt +++ b/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $conditionals (type $0) (param $0 i32) (param $1 i32) (result i32) (local $2 i32) (local $3 i32) diff --git a/test/passes/pick-load-signs.txt b/test/passes/pick-load-signs.txt index 3859e7ffa46..e8507fa29ab 100644 --- a/test/passes/pick-load-signs.txt +++ b/test/passes/pick-load-signs.txt @@ -1,7 +1,7 @@ (module (type $0 (func)) (type $1 (func (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $a (type $0) (local $y i32) (set_local $y diff --git a/test/passes/post-emscripten.txt b/test/passes/post-emscripten.txt index 90744a267df..9473180519e 100644 --- a/test/passes/post-emscripten.txt +++ b/test/passes/post-emscripten.txt @@ -4,7 +4,7 @@ (type $2 (func (param i32) (result i32))) (type $3 (func)) (import "global.Math" "pow" (func $Math_pow (param f64 f64) (result f64))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "load-off-2" (func $load-off-2)) (func $b0 (type $0) (param $x i32) (drop diff --git a/test/passes/precompute.txt b/test/passes/precompute.txt index 28c51bdd78b..c0dd8df0a8f 100644 --- a/test/passes/precompute.txt +++ b/test/passes/precompute.txt @@ -2,7 +2,7 @@ (type $0 (func (param i32))) (type $1 (func (result i32))) (type $2 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $x (type $0) (param $x i32) (call $x (i32.const 2300) diff --git a/test/passes/precompute_coalesce-locals_vacuum.txt b/test/passes/precompute_coalesce-locals_vacuum.txt index 67ab08c5953..dbeec78f153 100644 --- a/test/passes/precompute_coalesce-locals_vacuum.txt +++ b/test/passes/precompute_coalesce-locals_vacuum.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32) (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $nested-br_if-value (type $0) (param $0 i32) (result i32) (loop $label$0 (br $label$0) diff --git a/test/passes/print-call-graph.txt b/test/passes/print-call-graph.txt index 7cfc743e543..c1db051ade3 100644 --- a/test/passes/print-call-graph.txt +++ b/test/passes/print-call-graph.txt @@ -137,7 +137,7 @@ digraph call { (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32))) (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 9 9 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/passes/remove-imports.txt b/test/passes/remove-imports.txt index ed6d357b29a..f195df7e7a1 100644 --- a/test/passes/remove-imports.txt +++ b/test/passes/remove-imports.txt @@ -2,7 +2,7 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$d (func (result f64))) - (memory $0 1024 1024 notshared) + (memory $0 1024 1024) (func $nada (type $FUNCSIG$v) (nop) (drop diff --git a/test/passes/remove-memory.txt b/test/passes/remove-memory.txt index 6f244de87ae..ee65d237e23 100644 --- a/test/passes/remove-memory.txt +++ b/test/passes/remove-memory.txt @@ -1,3 +1,3 @@ (module - (memory $0 1024 1024 notshared) + (memory $0 1024 1024) ) diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt index 03a1b361b9d..62643ae00da 100644 --- a/test/passes/remove-unused-brs.txt +++ b/test/passes/remove-unused-brs.txt @@ -4,7 +4,7 @@ (type $2 (func (result i32))) (type $3 (func (param i32 i32) (result i32))) (type $4 (func (param i32 i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $b0-yes (type $0) (param $i1 i32) (block $topmost ) diff --git a/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt b/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt index f97538c6e4f..d2bc2ad9b5a 100644 --- a/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt +++ b/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32) (result f64))) (global $global$3 (mut f64) (f64.const 0)) - (memory $0 0 notshared) + (memory $0 0) (func $1 (type $0) (param $x i32) (result f64) (local $var$0 f64) (block $label$0 (result f64) diff --git a/test/passes/remove-unused-brs_shrink-level=1.txt b/test/passes/remove-unused-brs_shrink-level=1.txt index 70999fd2c95..09e727ea579 100644 --- a/test/passes/remove-unused-brs_shrink-level=1.txt +++ b/test/passes/remove-unused-brs_shrink-level=1.txt @@ -2,7 +2,7 @@ (type $0 (func (param i32))) (type $1 (func)) (type $2 (func (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $b14 (type $2) (result i32) (drop (select diff --git a/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt b/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt index 2311a8a00fa..06734897a4e 100644 --- a/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt +++ b/test/passes/remove-unused-brs_shrink-level=1_ignore-implicit-traps.txt @@ -2,7 +2,7 @@ (type $0 (func (param i32))) (type $1 (func)) (type $2 (func (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $b14 (type $2) (result i32) (drop (select diff --git a/test/passes/remove-unused-module-elements.txt b/test/passes/remove-unused-module-elements.txt index 0a74dabcc4c..abce5a5aa70 100644 --- a/test/passes/remove-unused-module-elements.txt +++ b/test/passes/remove-unused-module-elements.txt @@ -4,7 +4,7 @@ (type $2 (func (param i32) (result i32))) (table 1 1 anyfunc) (elem (i32.const 0) $called_indirect) - (memory $0 0 notshared) + (memory $0 0) (export "memory" (memory $0)) (export "exported" (func $exported)) (export "other1" (func $other1)) @@ -80,12 +80,12 @@ ) ) (module - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) ) (module (type $0 (func)) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) @@ -104,7 +104,7 @@ (global $int (mut i32) (get_global $imported)) (global $set (mut i32) (i32.const 100)) (global $exp_glob i32 (i32.const 600)) - (memory $0 0 notshared) + (memory $0 0) (export "one" (func $one)) (export "three" (func $three)) (export "exp_glob" (global $exp_glob)) diff --git a/test/passes/remove-unused-names.txt b/test/passes/remove-unused-names.txt index c9c320842a9..91b8b898193 100644 --- a/test/passes/remove-unused-names.txt +++ b/test/passes/remove-unused-names.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32) (result i32))) (type $1 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $b0 (type $0) (param $i1 i32) (result i32) (i32.const 0) ) diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt index 6113f03ace7..ed448607dc7 100644 --- a/test/passes/remove-unused-names_merge-blocks.txt +++ b/test/passes/remove-unused-names_merge-blocks.txt @@ -6,7 +6,7 @@ (type $4 (func (result i32))) (table 1 1 anyfunc) (elem (i32.const 0) $call-i) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $call-i (type $i) (param $0 i32) (nop) ) diff --git a/test/passes/remove-unused-names_precompute.txt b/test/passes/remove-unused-names_precompute.txt index 498aa023e1f..dccd4708e3b 100644 --- a/test/passes/remove-unused-names_precompute.txt +++ b/test/passes/remove-unused-names_precompute.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $__ZN10WasmAssertC2Ev__async_cb (type $0) (param $$0 i32) (block $switch-default (nop) diff --git a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt index b821f9017fe..d8ce1549186 100644 --- a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt +++ b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt @@ -52,7 +52,7 @@ (import "asm2wasm" "i32s-rem" (func $import$27 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-rem" (func $import$28 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $import$29 (param i32 i32) (result i32))) - (import "env" "memory" (memory $0 256 notshared)) + (import "env" "memory" (memory $0 256)) (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $import$32 i32)) (import "env" "tableBase" (global $import$33 i32)) diff --git a/test/passes/remove-unused-names_vacuum.txt b/test/passes/remove-unused-names_vacuum.txt index 419f2bd3110..999d8915e0d 100644 --- a/test/passes/remove-unused-names_vacuum.txt +++ b/test/passes/remove-unused-names_vacuum.txt @@ -1,7 +1,7 @@ (module (type $0 (func (result i32))) (type $1 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $return-i32-but-body-is-unreachable3 (type $0) (result i32) (local $label i32) (unreachable) diff --git a/test/passes/reorder-functions.txt b/test/passes/reorder-functions.txt index d41275baadb..9af9c34f02d 100644 --- a/test/passes/reorder-functions.txt +++ b/test/passes/reorder-functions.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $c (type $0) (call $c) (call $c) diff --git a/test/passes/reorder-locals.txt b/test/passes/reorder-locals.txt index 50fba030553..371a526884b 100644 --- a/test/passes/reorder-locals.txt +++ b/test/passes/reorder-locals.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32 i32))) (type $1 (func)) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $b0-yes (type $0) (param $a i32) (param $b i32) (local $z i32) (local $y i32) diff --git a/test/passes/rereloop.txt b/test/passes/rereloop.txt index a0836b49f8d..17a08439540 100644 --- a/test/passes/rereloop.txt +++ b/test/passes/rereloop.txt @@ -3,7 +3,7 @@ (type $1 (func (result i32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $trivial (type $0) (local $0 i32) (block diff --git a/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt b/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt index 3955479b9f2..9a49f3891a4 100644 --- a/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt +++ b/test/passes/rereloop_dce_remove-unused-brs_remove-unused-names_coalesce-locals_simplify-locals_reorder-locals_remove-unused-brs_merge-blocks_vacuum.txt @@ -3,7 +3,7 @@ (type $1 (func (result i32))) (type $2 (func (param i32) (result i32))) (type $3 (func (param i32))) - (memory $0 0 notshared) + (memory $0 0) (func $trivial (type $0) (nop) ) diff --git a/test/passes/simplify-locals-nostructure.txt b/test/passes/simplify-locals-nostructure.txt index c869b192d6d..2502c4549fd 100644 --- a/test/passes/simplify-locals-nostructure.txt +++ b/test/passes/simplify-locals-nostructure.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $contrast (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/simplify-locals-notee-nostructure.txt b/test/passes/simplify-locals-notee-nostructure.txt index 5722ecd28ed..027566e4310 100644 --- a/test/passes/simplify-locals-notee-nostructure.txt +++ b/test/passes/simplify-locals-notee-nostructure.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $contrast (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/simplify-locals-notee.txt b/test/passes/simplify-locals-notee.txt index e03c2f7c172..7677bfc6d23 100644 --- a/test/passes/simplify-locals-notee.txt +++ b/test/passes/simplify-locals-notee.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $contrast (type $0) (local $x i32) (local $y i32) diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt index e0455f7f2c5..8c12c274ac2 100644 --- a/test/passes/simplify-locals.txt +++ b/test/passes/simplify-locals.txt @@ -14,7 +14,7 @@ (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32))) (import "env" "moddi" (func $___udivmoddi4 (param i32 i32 i32 i32 i32) (result i32))) (import "env" "lp" (func $lp (param i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $contrast (type $FUNCSIG$v) (local $x i32) (local $y i32) diff --git a/test/passes/ssa.txt b/test/passes/ssa.txt index 4561c1aae94..d3f9140afec 100644 --- a/test/passes/ssa.txt +++ b/test/passes/ssa.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32))) (type $1 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $basics (type $0) (param $x i32) (local $y i32) (local $z f32) diff --git a/test/passes/untee.txt b/test/passes/untee.txt index c8aea067102..f174da801a6 100644 --- a/test/passes/untee.txt +++ b/test/passes/untee.txt @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $tee (type $0) (local $x i32) (local $y f64) diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt index 971c08fd18f..d1a388333b2 100644 --- a/test/passes/vacuum.txt +++ b/test/passes/vacuum.txt @@ -7,7 +7,7 @@ (type $FUNCSIG$i (func (result i32))) (import "env" "int" (func $int (result i32))) (global $Int i32 (i32.const 0)) - (memory $0 256 256 notshared) + (memory $0 256 256) (func $b (type $0) (nop) ) diff --git a/test/passes/vacuum_remove-unused-names_merge-blocks.txt b/test/passes/vacuum_remove-unused-names_merge-blocks.txt index 06232526ee2..c62581bc29e 100644 --- a/test/passes/vacuum_remove-unused-names_merge-blocks.txt +++ b/test/passes/vacuum_remove-unused-names_merge-blocks.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32) (result i32))) - (memory $0 0 notshared) + (memory $0 0) (func $return-block (type $0) (param $x i32) (result i32) (set_local $x (get_local $x) diff --git a/test/print/memory-import-shared.minified.txt b/test/print/memory-import-shared.minified.txt new file mode 100644 index 00000000000..56d11ab1709 --- /dev/null +++ b/test/print/memory-import-shared.minified.txt @@ -0,0 +1 @@ +(module(import "env" "memory" (memory $0 256 shared))) \ No newline at end of file diff --git a/test/print/memory-import-shared.txt b/test/print/memory-import-shared.txt new file mode 100644 index 00000000000..7bbb11ab1fa --- /dev/null +++ b/test/print/memory-import-shared.txt @@ -0,0 +1,3 @@ +(module + (import "env" "memory" (memory $0 256 shared)) +) diff --git a/test/print/memory-import-shared.wast b/test/print/memory-import-shared.wast new file mode 100644 index 00000000000..7bbb11ab1fa --- /dev/null +++ b/test/print/memory-import-shared.wast @@ -0,0 +1,3 @@ +(module + (import "env" "memory" (memory $0 256 shared)) +) diff --git a/test/print/memory-notshared.minified.txt b/test/print/memory-notshared.minified.txt new file mode 100644 index 00000000000..905aff3d537 --- /dev/null +++ b/test/print/memory-notshared.minified.txt @@ -0,0 +1,2 @@ +(module(memory $0 23 256) +) \ No newline at end of file diff --git a/test/print/memory-notshared.txt b/test/print/memory-notshared.txt new file mode 100644 index 00000000000..604a6b1cede --- /dev/null +++ b/test/print/memory-notshared.txt @@ -0,0 +1,3 @@ +(module + (memory $0 23 256) +) diff --git a/test/print/memory-notshared.wast b/test/print/memory-notshared.wast new file mode 100644 index 00000000000..4a7b8449a24 --- /dev/null +++ b/test/print/memory-notshared.wast @@ -0,0 +1,3 @@ +(module + (memory $0 23 256 notshared) +) diff --git a/test/print/memory-shared.minified.txt b/test/print/memory-shared.minified.txt new file mode 100644 index 00000000000..3f07a008007 --- /dev/null +++ b/test/print/memory-shared.minified.txt @@ -0,0 +1,2 @@ +(module(memory $0 23 256 shared) +) \ No newline at end of file diff --git a/test/print/memory-shared.txt b/test/print/memory-shared.txt new file mode 100644 index 00000000000..daff79f22f1 --- /dev/null +++ b/test/print/memory-shared.txt @@ -0,0 +1,3 @@ +(module + (memory $0 23 256 shared) +) diff --git a/test/print/memory-shared.wast b/test/print/memory-shared.wast new file mode 100644 index 00000000000..daff79f22f1 --- /dev/null +++ b/test/print/memory-shared.wast @@ -0,0 +1,3 @@ +(module + (memory $0 23 256 shared) +) diff --git a/test/reg_switch.wast.from-wast b/test/reg_switch.wast.from-wast index f1b67c6a04d..a766908048b 100644 --- a/test/reg_switch.wast.from-wast +++ b/test/reg_switch.wast.from-wast @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $0 (type $0) (if (i32.const 0) diff --git a/test/reg_switch.wast.fromBinary b/test/reg_switch.wast.fromBinary index a24a88c4e31..e68e8c153e8 100644 --- a/test/reg_switch.wast.fromBinary +++ b/test/reg_switch.wast.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $0 (type $0) (if (i32.const 0) diff --git a/test/reg_switch.wast.fromBinary.noDebugInfo b/test/reg_switch.wast.fromBinary.noDebugInfo index a24a88c4e31..e68e8c153e8 100644 --- a/test/reg_switch.wast.fromBinary.noDebugInfo +++ b/test/reg_switch.wast.fromBinary.noDebugInfo @@ -1,6 +1,6 @@ (module (type $0 (func)) - (memory $0 0 notshared) + (memory $0 0) (func $0 (type $0) (if (i32.const 0) diff --git a/test/stacky.wasm.fromBinary b/test/stacky.wasm.fromBinary index 9f993692929..375e216a2a6 100644 --- a/test/stacky.wasm.fromBinary +++ b/test/stacky.wasm.fromBinary @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (memory $0 256 256 notshared) + (memory $0 256 256) (export "add" (func $0)) (func $0 (type $0) (param $var$0 i32) (param $var$1 i32) (result i32) (local $2 i32) diff --git a/test/table-import.wast.from-wast b/test/table-import.wast.from-wast index 8d3d6f77adb..4bf63ed8d83 100644 --- a/test/table-import.wast.from-wast +++ b/test/table-import.wast.from-wast @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "table" (table 1 1 anyfunc)) (elem (i32.const 0) $foo) - (memory $0 0 notshared) + (memory $0 0) (func $foo (type $0) (nop) ) diff --git a/test/table-import.wast.fromBinary b/test/table-import.wast.fromBinary index f6a40195ef6..cfdbc8a43e9 100644 --- a/test/table-import.wast.fromBinary +++ b/test/table-import.wast.fromBinary @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "table" (table 1 1 anyfunc)) (elem (i32.const 0) $foo) - (memory $0 0 notshared) + (memory $0 0) (func $foo (type $0) (nop) ) diff --git a/test/table-import.wast.fromBinary.noDebugInfo b/test/table-import.wast.fromBinary.noDebugInfo index 7eeb77595a6..b45ca4a7d29 100644 --- a/test/table-import.wast.fromBinary.noDebugInfo +++ b/test/table-import.wast.fromBinary.noDebugInfo @@ -2,7 +2,7 @@ (type $0 (func)) (import "env" "table" (table 1 1 anyfunc)) (elem (i32.const 0) $0) - (memory $0 0 notshared) + (memory $0 0) (func $0 (type $0) (nop) ) diff --git a/test/two_sides.fromasm b/test/two_sides.fromasm index 4484d3dffd8..f79a0dd07e6 100644 --- a/test/two_sides.fromasm +++ b/test/two_sides.fromasm @@ -1,7 +1,7 @@ (module (type $FUNCSIG$id (func (param f64) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.clamp b/test/two_sides.fromasm.clamp index 0e03b04b220..8329325d199 100644 --- a/test/two_sides.fromasm.clamp +++ b/test/two_sides.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.clamp.no-opts b/test/two_sides.fromasm.clamp.no-opts index 1c22bc8a4c6..8ce7ab86cd5 100644 --- a/test/two_sides.fromasm.clamp.no-opts +++ b/test/two_sides.fromasm.clamp.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.imprecise b/test/two_sides.fromasm.imprecise index 5a34dd49b4f..9b486c29ce4 100644 --- a/test/two_sides.fromasm.imprecise +++ b/test/two_sides.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.imprecise.no-opts b/test/two_sides.fromasm.imprecise.no-opts index 085b028d809..aeaffb79dab 100644 --- a/test/two_sides.fromasm.imprecise.no-opts +++ b/test/two_sides.fromasm.imprecise.no-opts @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/two_sides.fromasm.no-opts b/test/two_sides.fromasm.no-opts index 1fc4bf86dd4..caa03418bbe 100644 --- a/test/two_sides.fromasm.no-opts +++ b/test/two_sides.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$id (func (param f64) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm b/test/unit.fromasm index 61a9bf18c7e..c869e2398c2 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -16,7 +16,7 @@ (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.clamp b/test/unit.fromasm.clamp index c499b03c54a..370e66c4d14 100644 --- a/test/unit.fromasm.clamp +++ b/test/unit.fromasm.clamp @@ -14,7 +14,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.clamp.no-opts b/test/unit.fromasm.clamp.no-opts index 4278e602451..8ff26568ee3 100644 --- a/test/unit.fromasm.clamp.no-opts +++ b/test/unit.fromasm.clamp.no-opts @@ -18,7 +18,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index 067e64e57cb..45912cffb7c 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -14,7 +14,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts index 289fb13f334..3747f2c9010 100644 --- a/test/unit.fromasm.imprecise.no-opts +++ b/test/unit.fromasm.imprecise.no-opts @@ -18,7 +18,7 @@ (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts index 7183a348660..dba91cfcd2f 100644 --- a/test/unit.fromasm.no-opts +++ b/test/unit.fromasm.no-opts @@ -20,7 +20,7 @@ (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 25 25 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unit.wast.from-wast b/test/unit.wast.from-wast index 389a2535452..bb66845af0a 100644 --- a/test/unit.wast.from-wast +++ b/test/unit.wast.from-wast @@ -14,7 +14,7 @@ (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) (table 10 anyfunc) (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) - (memory $0 4096 4096 notshared) + (memory $0 4096 4096) (data (i32.const 1026) "\14\00") (export "big_negative" (func $big_negative)) (func $big_negative (type $FUNCSIG$v) diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary index e297fa68602..7656dc7d78f 100644 --- a/test/unit.wast.fromBinary +++ b/test/unit.wast.fromBinary @@ -14,7 +14,7 @@ (import "asm2wasm" "f64-rem" (func $import$2 (param f64 f64) (result f64))) (table 10 anyfunc) (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) - (memory $0 4096 4096 notshared) + (memory $0 4096 4096) (data (i32.const 1026) "\14\00") (export "big_negative" (func $big_negative)) (func $big_negative (type $1) diff --git a/test/unit.wast.fromBinary.noDebugInfo b/test/unit.wast.fromBinary.noDebugInfo index aefa0a8340c..bfcc12c6b6f 100644 --- a/test/unit.wast.fromBinary.noDebugInfo +++ b/test/unit.wast.fromBinary.noDebugInfo @@ -14,7 +14,7 @@ (import "asm2wasm" "f64-rem" (func $import$2 (param f64 f64) (result f64))) (table 10 anyfunc) (elem (i32.const 0) $17 $0 $17 $17 $18 $18 $1 $18 $17 $15) - (memory $0 4096 4096 notshared) + (memory $0 4096 4096) (data (i32.const 1026) "\14\00") (export "big_negative" (func $0)) (func $0 (type $1) diff --git a/test/unreachable-import_wasm-only.fromasm b/test/unreachable-import_wasm-only.fromasm index 710923cc094..b6398918838 100644 --- a/test/unreachable-import_wasm-only.fromasm +++ b/test/unreachable-import_wasm-only.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.clamp b/test/unreachable-import_wasm-only.fromasm.clamp index 710923cc094..b6398918838 100644 --- a/test/unreachable-import_wasm-only.fromasm.clamp +++ b/test/unreachable-import_wasm-only.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.clamp.no-opts b/test/unreachable-import_wasm-only.fromasm.clamp.no-opts index ece7589734f..af8c60715b8 100644 --- a/test/unreachable-import_wasm-only.fromasm.clamp.no-opts +++ b/test/unreachable-import_wasm-only.fromasm.clamp.no-opts @@ -14,7 +14,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "___cxa_allocate_exception" (func $___cxa_allocate_exception (param i32) (result i32))) (import "env" "___cxa_throw" (func $___cxa_throw (param i32 i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.imprecise b/test/unreachable-import_wasm-only.fromasm.imprecise index 01030ee09c3..208c4435e5e 100644 --- a/test/unreachable-import_wasm-only.fromasm.imprecise +++ b/test/unreachable-import_wasm-only.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts b/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts index ece7589734f..af8c60715b8 100644 --- a/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts +++ b/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts @@ -14,7 +14,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "___cxa_allocate_exception" (func $___cxa_allocate_exception (param i32) (result i32))) (import "env" "___cxa_throw" (func $___cxa_throw (param i32 i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/unreachable-import_wasm-only.fromasm.no-opts b/test/unreachable-import_wasm-only.fromasm.no-opts index ece7589734f..af8c60715b8 100644 --- a/test/unreachable-import_wasm-only.fromasm.no-opts +++ b/test/unreachable-import_wasm-only.fromasm.no-opts @@ -14,7 +14,7 @@ (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "___cxa_allocate_exception" (func $___cxa_allocate_exception (param i32) (result i32))) (import "env" "___cxa_throw" (func $___cxa_throw (param i32 i32 i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm b/test/use-import-and-drop.fromasm index 37439644a17..5b42aff4aac 100644 --- a/test/use-import-and-drop.fromasm +++ b/test/use-import-and-drop.fromasm @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.clamp b/test/use-import-and-drop.fromasm.clamp index 37439644a17..5b42aff4aac 100644 --- a/test/use-import-and-drop.fromasm.clamp +++ b/test/use-import-and-drop.fromasm.clamp @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.clamp.no-opts b/test/use-import-and-drop.fromasm.clamp.no-opts index 88445c9dace..332851f6143 100644 --- a/test/use-import-and-drop.fromasm.clamp.no-opts +++ b/test/use-import-and-drop.fromasm.clamp.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.imprecise b/test/use-import-and-drop.fromasm.imprecise index 8c0fb002264..ddb433043ea 100644 --- a/test/use-import-and-drop.fromasm.imprecise +++ b/test/use-import-and-drop.fromasm.imprecise @@ -1,5 +1,5 @@ (module - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.imprecise.no-opts b/test/use-import-and-drop.fromasm.imprecise.no-opts index 88445c9dace..332851f6143 100644 --- a/test/use-import-and-drop.fromasm.imprecise.no-opts +++ b/test/use-import-and-drop.fromasm.imprecise.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/use-import-and-drop.fromasm.no-opts b/test/use-import-and-drop.fromasm.no-opts index 88445c9dace..332851f6143 100644 --- a/test/use-import-and-drop.fromasm.no-opts +++ b/test/use-import-and-drop.fromasm.no-opts @@ -1,7 +1,7 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 0 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm b/test/wasm-only.fromasm index 3903254dcef..f12226b1dcf 100644 --- a/test/wasm-only.fromasm +++ b/test/wasm-only.fromasm @@ -14,7 +14,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.clamp b/test/wasm-only.fromasm.clamp index 3903254dcef..f12226b1dcf 100644 --- a/test/wasm-only.fromasm.clamp +++ b/test/wasm-only.fromasm.clamp @@ -14,7 +14,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.clamp.no-opts b/test/wasm-only.fromasm.clamp.no-opts index 3c5be464bd0..baac47fba2f 100644 --- a/test/wasm-only.fromasm.clamp.no-opts +++ b/test/wasm-only.fromasm.clamp.no-opts @@ -15,7 +15,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.imprecise b/test/wasm-only.fromasm.imprecise index 59bf79a6e7e..e05da979947 100644 --- a/test/wasm-only.fromasm.imprecise +++ b/test/wasm-only.fromasm.imprecise @@ -14,7 +14,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.imprecise.no-opts b/test/wasm-only.fromasm.imprecise.no-opts index 6ad896ef8e9..8c49b41d557 100644 --- a/test/wasm-only.fromasm.imprecise.no-opts +++ b/test/wasm-only.fromasm.imprecise.no-opts @@ -15,7 +15,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) diff --git a/test/wasm-only.fromasm.no-opts b/test/wasm-only.fromasm.no-opts index 3c5be464bd0..baac47fba2f 100644 --- a/test/wasm-only.fromasm.no-opts +++ b/test/wasm-only.fromasm.no-opts @@ -15,7 +15,7 @@ (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32))) (import "env" "_fabsf" (func $legalimport$_fabsf (param f64) (result f64))) (import "env" "do_i64" (func $legalimport$do_i64 (result i32))) - (import "env" "memory" (memory $0 256 256 notshared)) + (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 3 3 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) From 7d7bc0d976772e5f09720d53e47df7e0831fcaa7 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Mon, 26 Jun 2017 17:58:07 -0700 Subject: [PATCH 07/11] Add binary support --- src/wasm-binary.h | 4 ++-- src/wasm/wasm-binary.cpp | 32 ++++++++++++++++++++---------- test/memory-shared.wast | 4 ++++ test/memory-shared.wast.from-wast | 4 ++++ test/memory-shared.wast.fromBinary | 3 +++ 5 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 test/memory-shared.wast create mode 100644 test/memory-shared.wast.from-wast create mode 100644 test/memory-shared.wast.fromBinary diff --git a/src/wasm-binary.h b/src/wasm-binary.h index 889a3aa6c90..753609935e5 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -560,7 +560,7 @@ class WasmBinaryWriter : public Visitor { void write(); void writeHeader(); int32_t writeU32LEBPlaceholder(); - void writeResizableLimits(Address initial, Address maximum, bool hasMaximum); + void writeResizableLimits(Address initial, Address maximum, bool hasMaximum, bool shared); int32_t startSection(BinaryConsts::Section code); void finishSection(int32_t start); int32_t startSubsection(BinaryConsts::UserSections::Subsection code); @@ -712,7 +712,7 @@ class WasmBinaryBuilder { // gets a name in the combined function import+defined function space Name getFunctionIndexName(Index i); - void getResizableLimits(Address& initial, Address& max, Address defaultIfNoMax); + void getResizableLimits(Address& initial, Address& max, bool& shared, Address defaultIfNoMax); void readImports(); std::vector functionTypes; // types of defined functions diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index 3b6bbbb9def..e810ce45894 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -71,8 +71,9 @@ int32_t WasmBinaryWriter::writeU32LEBPlaceholder() { return ret; } -void WasmBinaryWriter::writeResizableLimits(Address initial, Address maximum, bool hasMaximum) { - uint32_t flags = hasMaximum ? 1 : 0; +void WasmBinaryWriter::writeResizableLimits(Address initial, Address maximum, + bool hasMaximum, bool shared) { + uint32_t flags = (uint32_t) hasMaximum | (uint32_t) shared << 1; o << U32LEB(flags); o << U32LEB(initial); if (hasMaximum) { @@ -113,7 +114,8 @@ void WasmBinaryWriter::writeMemory() { if (debug) std::cerr << "== writeMemory" << std::endl; auto start = startSection(BinaryConsts::Section::Memory); o << U32LEB(1); // Define 1 memory - writeResizableLimits(wasm->memory.initial, wasm->memory.max, wasm->memory.max != Memory::kMaxSize); + writeResizableLimits(wasm->memory.initial, wasm->memory.max, + wasm->memory.max != Memory::kMaxSize, wasm->memory.shared); finishSection(start); } @@ -161,11 +163,12 @@ void WasmBinaryWriter::writeImports() { case ExternalKind::Function: o << U32LEB(getFunctionTypeIndex(import->functionType)); break; case ExternalKind::Table: { o << S32LEB(BinaryConsts::EncodedType::AnyFunc); - writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize); + writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize, false); break; } case ExternalKind::Memory: { - writeResizableLimits(wasm->memory.initial, wasm->memory.max, wasm->memory.max != Memory::kMaxSize); + writeResizableLimits(wasm->memory.initial, wasm->memory.max, + wasm->memory.max != Memory::kMaxSize, wasm->memory.shared); break; } case ExternalKind::Global: @@ -368,7 +371,7 @@ void WasmBinaryWriter::writeFunctionTableDeclaration() { auto start = startSection(BinaryConsts::Section::Table); o << U32LEB(1); // Declare 1 table. o << S32LEB(BinaryConsts::EncodedType::AnyFunc); - writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize); + writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize, false); finishSection(start); } @@ -1237,7 +1240,7 @@ void WasmBinaryBuilder::readMemory() { throw ParseException("Memory cannot be both imported and defined"); } wasm.memory.exists = true; - getResizableLimits(wasm.memory.initial, wasm.memory.max, Memory::kMaxSize); + getResizableLimits(wasm.memory.initial, wasm.memory.max, wasm.memory.shared, Memory::kMaxSize); } void WasmBinaryBuilder::readSignatures() { @@ -1284,10 +1287,13 @@ Name WasmBinaryBuilder::getFunctionIndexName(Index i) { } } -void WasmBinaryBuilder::getResizableLimits(Address& initial, Address& max, Address defaultIfNoMax) { +void WasmBinaryBuilder::getResizableLimits(Address& initial, Address& max, bool &shared, Address defaultIfNoMax) { auto flags = getU32LEB(); initial = getU32LEB(); bool hasMax = flags & 0x1; + bool is_shared = flags & 0x2; + if (is_shared && !hasMax) throw ParseException("shared memory must have max size"); + shared = is_shared; if (hasMax) max = getU32LEB(); else max = defaultIfNoMax; } @@ -1320,13 +1326,15 @@ void WasmBinaryBuilder::readImports() { if (elementType != BinaryConsts::EncodedType::AnyFunc) throw ParseException("Imported table type is not AnyFunc"); wasm.table.exists = true; wasm.table.imported = true; - getResizableLimits(wasm.table.initial, wasm.table.max, Table::kMaxSize); + bool is_shared; + getResizableLimits(wasm.table.initial, wasm.table.max, is_shared, Table::kMaxSize); + if (is_shared) throw ParseException("Tables may not be shared"); break; } case ExternalKind::Memory: { wasm.memory.exists = true; wasm.memory.imported = true; - getResizableLimits(wasm.memory.initial, wasm.memory.max, Memory::kMaxSize); + getResizableLimits(wasm.memory.initial, wasm.memory.max, wasm.memory.shared, Memory::kMaxSize); break; } case ExternalKind::Global: { @@ -1759,7 +1767,9 @@ void WasmBinaryBuilder::readFunctionTableDeclaration() { wasm.table.exists = true; auto elemType = getS32LEB(); if (elemType != BinaryConsts::EncodedType::AnyFunc) throw ParseException("ElementType must be AnyFunc in MVP"); - getResizableLimits(wasm.table.initial, wasm.table.max, Table::kMaxSize); + bool is_shared; + getResizableLimits(wasm.table.initial, wasm.table.max, is_shared, Table::kMaxSize); + if (is_shared) throw ParseException("Tables may not be shared"); } void WasmBinaryBuilder::readTableElements() { diff --git a/test/memory-shared.wast b/test/memory-shared.wast new file mode 100644 index 00000000000..b16e00d992e --- /dev/null +++ b/test/memory-shared.wast @@ -0,0 +1,4 @@ +(module + (memory $0 23 256 shared) +) + diff --git a/test/memory-shared.wast.from-wast b/test/memory-shared.wast.from-wast new file mode 100644 index 00000000000..b16e00d992e --- /dev/null +++ b/test/memory-shared.wast.from-wast @@ -0,0 +1,4 @@ +(module + (memory $0 23 256 shared) +) + diff --git a/test/memory-shared.wast.fromBinary b/test/memory-shared.wast.fromBinary new file mode 100644 index 00000000000..daff79f22f1 --- /dev/null +++ b/test/memory-shared.wast.fromBinary @@ -0,0 +1,3 @@ +(module + (memory $0 23 256 shared) +) From 6a9af72251333873536427fd00a1d279e91ca8dc Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Tue, 27 Jun 2017 10:01:57 -0700 Subject: [PATCH 08/11] fix whitespace --- test/memory-shared.wast.from-wast | 1 - test/memory-shared.wast.fromBinary | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/test/memory-shared.wast.from-wast b/test/memory-shared.wast.from-wast index b16e00d992e..daff79f22f1 100644 --- a/test/memory-shared.wast.from-wast +++ b/test/memory-shared.wast.from-wast @@ -1,4 +1,3 @@ (module (memory $0 23 256 shared) ) - diff --git a/test/memory-shared.wast.fromBinary b/test/memory-shared.wast.fromBinary index daff79f22f1..b16e00d992e 100644 --- a/test/memory-shared.wast.fromBinary +++ b/test/memory-shared.wast.fromBinary @@ -1,3 +1,4 @@ (module (memory $0 23 256 shared) ) + From 42034cb664262a3840d2c984f6bfd655baa730a2 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Tue, 27 Jun 2017 11:16:30 -0700 Subject: [PATCH 09/11] Add missing test file --- test/memory-shared.wast.fromBinary.noDebugInfo | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 test/memory-shared.wast.fromBinary.noDebugInfo diff --git a/test/memory-shared.wast.fromBinary.noDebugInfo b/test/memory-shared.wast.fromBinary.noDebugInfo new file mode 100644 index 00000000000..b16e00d992e --- /dev/null +++ b/test/memory-shared.wast.fromBinary.noDebugInfo @@ -0,0 +1,4 @@ +(module + (memory $0 23 256 shared) +) + From 2b5e80b4c80f9dedff8ef9411a743aac048798bf Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Tue, 27 Jun 2017 13:15:00 -0700 Subject: [PATCH 10/11] reviews --- auto_update_tests.py | 2 +- src/wasm/wasm-binary.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/auto_update_tests.py b/auto_update_tests.py index 9ec77b8e7f0..f7715a38228 100755 --- a/auto_update_tests.py +++ b/auto_update_tests.py @@ -235,7 +235,7 @@ f.close() cmd = ['mozjs', 'a.js'] out = run_command(cmd, stderr=subprocess.STDOUT) - open(os.path.join('test', 'binaryen.js', s + '.txt'), 'w').write(out) + with open(os.path.join('test', 'binaryen.js', s + '.txt'), 'w') as o: o.write(out) print '\n[ checking wasm-ctor-eval... ]\n' diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index e810ce45894..e1f82ce0ab6 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -1291,9 +1291,9 @@ void WasmBinaryBuilder::getResizableLimits(Address& initial, Address& max, bool auto flags = getU32LEB(); initial = getU32LEB(); bool hasMax = flags & 0x1; - bool is_shared = flags & 0x2; - if (is_shared && !hasMax) throw ParseException("shared memory must have max size"); - shared = is_shared; + bool isShared = flags & 0x2; + if (isShared && !hasMax) throw ParseException("shared memory must have max size"); + shared = isShared; if (hasMax) max = getU32LEB(); else max = defaultIfNoMax; } From c2ccba61e65740347326af96c406f3098f6bc98f Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Tue, 27 Jun 2017 13:52:04 -0700 Subject: [PATCH 11/11] jgravelle reviews --- auto_update_tests.py | 2 +- src/wasm-binary.h | 5 +++++ src/wasm/wasm-binary.cpp | 12 +++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/auto_update_tests.py b/auto_update_tests.py index f7715a38228..0b43267318a 100755 --- a/auto_update_tests.py +++ b/auto_update_tests.py @@ -233,7 +233,7 @@ f.write(open(os.path.join('bin', 'binaryen.js')).read()) f.write(open(os.path.join('test', 'binaryen.js', s)).read()) f.close() - cmd = ['mozjs', 'a.js'] + cmd = [MOZJS, 'a.js'] out = run_command(cmd, stderr=subprocess.STDOUT) with open(os.path.join('test', 'binaryen.js', s + '.txt'), 'w') as o: o.write(out) diff --git a/src/wasm-binary.h b/src/wasm-binary.h index 753609935e5..9e75d6501a6 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -515,6 +515,11 @@ enum MemoryAccess { NaturalAlignment = 0 }; +enum MemoryFlags { + HasMaximum = 1 << 0, + IsShared = 1 << 1 +}; + } // namespace BinaryConsts diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index e1f82ce0ab6..359d9d8f8b9 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -73,7 +73,9 @@ int32_t WasmBinaryWriter::writeU32LEBPlaceholder() { void WasmBinaryWriter::writeResizableLimits(Address initial, Address maximum, bool hasMaximum, bool shared) { - uint32_t flags = (uint32_t) hasMaximum | (uint32_t) shared << 1; + uint32_t flags = + (hasMaximum ? (uint32_t) BinaryConsts::HasMaximum : 0U) | + (shared ? (uint32_t) BinaryConsts::IsShared : 0U); o << U32LEB(flags); o << U32LEB(initial); if (hasMaximum) { @@ -163,7 +165,7 @@ void WasmBinaryWriter::writeImports() { case ExternalKind::Function: o << U32LEB(getFunctionTypeIndex(import->functionType)); break; case ExternalKind::Table: { o << S32LEB(BinaryConsts::EncodedType::AnyFunc); - writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize, false); + writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize, /*shared=*/false); break; } case ExternalKind::Memory: { @@ -371,7 +373,7 @@ void WasmBinaryWriter::writeFunctionTableDeclaration() { auto start = startSection(BinaryConsts::Section::Table); o << U32LEB(1); // Declare 1 table. o << S32LEB(BinaryConsts::EncodedType::AnyFunc); - writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize, false); + writeResizableLimits(wasm->table.initial, wasm->table.max, wasm->table.max != Table::kMaxSize, /*shared=*/false); finishSection(start); } @@ -1290,8 +1292,8 @@ Name WasmBinaryBuilder::getFunctionIndexName(Index i) { void WasmBinaryBuilder::getResizableLimits(Address& initial, Address& max, bool &shared, Address defaultIfNoMax) { auto flags = getU32LEB(); initial = getU32LEB(); - bool hasMax = flags & 0x1; - bool isShared = flags & 0x2; + bool hasMax = flags & BinaryConsts::HasMaximum; + bool isShared = flags & BinaryConsts::IsShared; if (isShared && !hasMax) throw ParseException("shared memory must have max size"); shared = isShared; if (hasMax) max = getU32LEB();