diff options
-rw-r--r-- | src/parser/contexts.h | 8 | ||||
-rw-r--r-- | src/parser/parsers.h | 8 | ||||
-rw-r--r-- | src/wasm-builder.h | 9 | ||||
-rw-r--r-- | src/wasm-ir-builder.h | 3 | ||||
-rw-r--r-- | src/wasm/wasm-ir-builder.cpp | 17 | ||||
-rw-r--r-- | test/lit/wat-kitchen-sink.wast | 181 |
6 files changed, 142 insertions, 84 deletions
diff --git a/src/parser/contexts.h b/src/parser/contexts.h index aa207fcd5..f6dd92063 100644 --- a/src/parser/contexts.h +++ b/src/parser/contexts.h @@ -432,6 +432,10 @@ struct NullInstrParserCtx { Result<> makeArrayNewElem(Index, HeapTypeT, DataIdxT) { return Ok{}; } + template<typename HeapTypeT> + Result<> makeArrayNewFixed(Index, HeapTypeT, uint32_t) { + return Ok{}; + } template<typename HeapTypeT> Result<> makeArrayGet(Index, HeapTypeT, bool) { return Ok{}; } @@ -1334,6 +1338,10 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> { return withLoc(pos, irBuilder.makeArrayNewElem(type, elem)); } + Result<> makeArrayNewFixed(Index pos, HeapType type, uint32_t arity) { + return withLoc(pos, irBuilder.makeArrayNewFixed(type, arity)); + } + Result<> makeArrayGet(Index pos, HeapType type, bool signed_) { return withLoc(pos, irBuilder.makeArrayGet(type, signed_)); } diff --git a/src/parser/parsers.h b/src/parser/parsers.h index 610e2953a..2d90a7d27 100644 --- a/src/parser/parsers.h +++ b/src/parser/parsers.h @@ -1382,7 +1382,13 @@ template<typename Ctx> Result<> makeArrayNewElem(Ctx& ctx, Index pos) { } template<typename Ctx> Result<> makeArrayNewFixed(Ctx& ctx, Index pos) { - return ctx.in.err("unimplemented instruction"); + auto type = typeidx(ctx); + CHECK_ERR(type); + auto arity = ctx.in.takeU32(); + if (!arity) { + return ctx.in.err(pos, "expected array.new_fixed arity"); + } + return ctx.makeArrayNewFixed(pos, *type, *arity); } template<typename Ctx> diff --git a/src/wasm-builder.h b/src/wasm-builder.h index 9e2881145..1dd7a7e09 100644 --- a/src/wasm-builder.h +++ b/src/wasm-builder.h @@ -992,14 +992,19 @@ public: ret->finalize(); return ret; } - ArrayNewFixed* makeArrayNewFixed(HeapType type, - const std::vector<Expression*>& values) { + template<typename T> + ArrayNewFixed* makeArrayNewFixed(HeapType type, const T& values) { auto* ret = wasm.allocator.alloc<ArrayNewFixed>(); ret->values.set(values); ret->type = Type(type, NonNullable); ret->finalize(); return ret; } + ArrayNewFixed* + makeArrayNewFixed(HeapType type, + std::initializer_list<Expression*>&& values) { + return makeArrayNewFixed(type, values); + } ArrayGet* makeArrayGet(Expression* ref, Expression* index, Type type, diff --git a/src/wasm-ir-builder.h b/src/wasm-ir-builder.h index 24b430e25..4b6cacae9 100644 --- a/src/wasm-ir-builder.h +++ b/src/wasm-ir-builder.h @@ -162,7 +162,7 @@ public: [[nodiscard]] Result<> makeArrayNewDefault(HeapType type); [[nodiscard]] Result<> makeArrayNewData(HeapType type, Name data); [[nodiscard]] Result<> makeArrayNewElem(HeapType type, Name elem); - // [[nodiscard]] Result<> makeArrayNewFixed(); + [[nodiscard]] Result<> makeArrayNewFixed(HeapType type, uint32_t arity); [[nodiscard]] Result<> makeArrayGet(HeapType type, bool signed_); [[nodiscard]] Result<> makeArraySet(HeapType type); [[nodiscard]] Result<> makeArrayLen(); @@ -191,6 +191,7 @@ public: [[nodiscard]] Result<> visitReturn(Return*); [[nodiscard]] Result<> visitStructNew(StructNew*); [[nodiscard]] Result<> visitArrayNew(ArrayNew*); + [[nodiscard]] Result<> visitArrayNewFixed(ArrayNewFixed*); [[nodiscard]] Result<> visitBreak(Break*, std::optional<Index> label = std::nullopt); [[nodiscard]] Result<> diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp index 843e0ed78..9b2a944dd 100644 --- a/src/wasm/wasm-ir-builder.cpp +++ b/src/wasm/wasm-ir-builder.cpp @@ -287,6 +287,15 @@ Result<> IRBuilder::visitArrayNew(ArrayNew* curr) { return Ok{}; } +Result<> IRBuilder::visitArrayNewFixed(ArrayNewFixed* curr) { + for (size_t i = 0, size = curr->values.size(); i < size; ++i) { + auto val = pop(); + CHECK_ERR(val); + curr->values[size - i - 1] = *val; + } + return Ok{}; +} + Result<Expression*> IRBuilder::getBranchValue(Name labelName, std::optional<Index> label) { if (!label) { @@ -1000,7 +1009,13 @@ Result<> IRBuilder::makeArrayNewElem(HeapType type, Name elem) { return Ok{}; } -// Result<> IRBuilder::makeArrayNewFixed() {} +Result<> IRBuilder::makeArrayNewFixed(HeapType type, uint32_t arity) { + ArrayNewFixed curr(wasm.allocator); + curr.values.resize(arity); + CHECK_ERR(visitArrayNewFixed(&curr)); + push(builder.makeArrayNewFixed(type, curr.values)); + return Ok{}; +} Result<> IRBuilder::makeArrayGet(HeapType type, bool signed_) { ArrayGet curr; diff --git a/test/lit/wat-kitchen-sink.wast b/test/lit/wat-kitchen-sink.wast index 6b70a7822..751b9f5ef 100644 --- a/test/lit/wat-kitchen-sink.wast +++ b/test/lit/wat-kitchen-sink.wast @@ -25,11 +25,13 @@ ;; CHECK: (type $8 (func (param anyref))) - ;; CHECK: (type $9 (func (param i32))) + ;; CHECK: (type $a0 (array i32)) - ;; CHECK: (type $10 (func (param i32 i32 i32))) + ;; CHECK: (type $10 (func (param i32))) - ;; CHECK: (type $11 (func (param v128 i32) (result v128))) + ;; CHECK: (type $11 (func (param i32 i32 i32))) + + ;; CHECK: (type $12 (func (param v128 i32) (result v128))) ;; CHECK: (rec ;; CHECK-NEXT: (type $s0 (struct )) @@ -44,75 +46,75 @@ ;; CHECK: (type $packed-i16 (array (mut i16))) - ;; CHECK: (type $16 (func (param i32 i64) (result f32))) + ;; CHECK: (type $17 (func (param i32 i64) (result f32))) ;; CHECK: (type $many (sub (func (param i32 i64 f32 f64) (result anyref (ref func))))) - ;; CHECK: (type $18 (func (param i32 i32))) + ;; CHECK: (type $19 (func (param i32 i32))) - ;; CHECK: (type $19 (func (param i32 i32 f64 f64))) + ;; CHECK: (type $20 (func (param i32 i32 f64 f64))) - ;; CHECK: (type $20 (func (param i64))) + ;; CHECK: (type $21 (func (param i64))) - ;; CHECK: (type $21 (func (param v128) (result i32))) + ;; CHECK: (type $22 (func (param v128) (result i32))) - ;; CHECK: (type $22 (func (param v128 v128) (result v128))) + ;; CHECK: (type $23 (func (param v128 v128) (result v128))) - ;; CHECK: (type $23 (func (param v128 v128 v128) (result v128))) + ;; CHECK: (type $24 (func (param v128 v128 v128) (result v128))) - ;; CHECK: (type $24 (func (param i32 i64 v128))) + ;; CHECK: (type $25 (func (param i32 i64 v128))) - ;; CHECK: (type $25 (func (param i32 i32 i64 i64))) + ;; CHECK: (type $26 (func (param i32 i32 i64 i64))) - ;; CHECK: (type $26 (func (param i32) (result i32))) + ;; CHECK: (type $27 (func (param i32) (result i32))) - ;; CHECK: (type $27 (func (param i32 i64) (result i32 i64))) + ;; CHECK: (type $28 (func (param i32 i64) (result i32 i64))) - ;; CHECK: (type $28 (func (param i64) (result i32 i64))) + ;; CHECK: (type $29 (func (param i64) (result i32 i64))) - ;; CHECK: (type $29 (func (param i32) (result i32 i64))) + ;; CHECK: (type $30 (func (param i32) (result i32 i64))) - ;; CHECK: (type $30 (func (param anyref) (result i32))) + ;; CHECK: (type $31 (func (param anyref) (result i32))) - ;; CHECK: (type $31 (func (param eqref eqref) (result i32))) + ;; CHECK: (type $32 (func (param eqref eqref) (result i32))) - ;; CHECK: (type $32 (func (param i32) (result i31ref))) + ;; CHECK: (type $33 (func (param i32) (result i31ref))) - ;; CHECK: (type $33 (func (param i31ref))) + ;; CHECK: (type $34 (func (param i31ref))) - ;; CHECK: (type $34 (func (param i32 i64) (result (ref $pair)))) + ;; CHECK: (type $35 (func (param i32 i64) (result (ref $pair)))) - ;; CHECK: (type $35 (func (result (ref $pair)))) + ;; CHECK: (type $36 (func (result (ref $pair)))) - ;; CHECK: (type $36 (func (param (ref $pair)) (result i32))) + ;; CHECK: (type $37 (func (param (ref $pair)) (result i32))) - ;; CHECK: (type $37 (func (param (ref $pair)) (result i64))) + ;; CHECK: (type $38 (func (param (ref $pair)) (result i64))) - ;; CHECK: (type $38 (func (param (ref $pair) i32))) + ;; CHECK: (type $39 (func (param (ref $pair) i32))) - ;; CHECK: (type $39 (func (param (ref $pair) i64))) + ;; CHECK: (type $40 (func (param (ref $pair) i64))) - ;; CHECK: (type $40 (func (param i64 i32) (result (ref $a1)))) + ;; CHECK: (type $41 (func (param i64 i32) (result (ref $a1)))) - ;; CHECK: (type $41 (func (param i32) (result (ref $a1)))) + ;; CHECK: (type $42 (func (param i32) (result (ref $a1)))) - ;; CHECK: (type $42 (func (param i32 i32) (result (ref $a1)))) + ;; CHECK: (type $43 (func (param i32 i32) (result (ref $a1)))) - ;; CHECK: (type $43 (func (param (ref $a1) i32) (result i64))) + ;; CHECK: (type $44 (func (param (ref $a1) i32) (result i64))) - ;; CHECK: (type $44 (func (param (ref $packed-i8) i32) (result i32))) + ;; CHECK: (type $45 (func (param (ref $packed-i8) i32) (result i32))) - ;; CHECK: (type $45 (func (param (ref $packed-i16) i32) (result i32))) + ;; CHECK: (type $46 (func (param (ref $packed-i16) i32) (result i32))) - ;; CHECK: (type $46 (func (param (ref $a2) i32 f32))) + ;; CHECK: (type $47 (func (param (ref $a2) i32 f32))) - ;; CHECK: (type $47 (func (param arrayref) (result i32))) + ;; CHECK: (type $48 (func (param arrayref) (result i32))) - ;; CHECK: (type $48 (func (param (ref $a2) i32 (ref $a2) i32 i32))) + ;; CHECK: (type $49 (func (param (ref $a2) i32 (ref $a2) i32 i32))) - ;; CHECK: (type $49 (func (param (ref $a2) i32 f32 i32))) + ;; CHECK: (type $50 (func (param (ref $a2) i32 f32 i32))) - ;; CHECK: (type $50 (func (param externref))) + ;; CHECK: (type $51 (func (param externref))) ;; CHECK: (type $s2 (struct (field i32))) (type $s2 (struct i32)) @@ -129,7 +131,6 @@ ;; CHECK: (type $s8 (struct (field i32) (field i64) (field $z f32) (field f64) (field (mut i32)))) (type $s8 (struct i32 (field) i64 (field $z f32) (field f64 (mut i32)))) - ;; CHECK: (type $a0 (array i32)) (type $a0 (array i32)) (type $a1 (array (field i64))) (type $a2 (array (mut f32))) @@ -236,11 +237,11 @@ ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) - ;; CHECK: (func $f1 (type $9) (param $0 i32) + ;; CHECK: (func $f1 (type $10) (param $0 i32) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $f1 (param i32)) - ;; CHECK: (func $f2 (type $9) (param $x i32) + ;; CHECK: (func $f2 (type $10) (param $x i32) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $f2 (param $x i32)) @@ -684,7 +685,7 @@ drop ) - ;; CHECK: (func $locals (type $18) (param $0 i32) (param $x i32) + ;; CHECK: (func $locals (type $19) (param $0 i32) (param $x i32) ;; CHECK-NEXT: (local $2 i32) ;; CHECK-NEXT: (local $y i32) ;; CHECK-NEXT: (drop @@ -1720,7 +1721,7 @@ ) - ;; CHECK: (func $binary (type $19) (param $0 i32) (param $1 i32) (param $2 f64) (param $3 f64) + ;; CHECK: (func $binary (type $20) (param $0 i32) (param $1 i32) (param $2 f64) (param $3 f64) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (i32.add ;; CHECK-NEXT: (local.get $0) @@ -1745,7 +1746,7 @@ drop ) - ;; CHECK: (func $unary (type $20) (param $0 i64) + ;; CHECK: (func $unary (type $21) (param $0 i64) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (i64.eqz ;; CHECK-NEXT: (local.get $0) @@ -1758,7 +1759,7 @@ drop ) - ;; CHECK: (func $select (type $10) (param $0 i32) (param $1 i32) (param $2 i32) + ;; CHECK: (func $select (type $11) (param $0 i32) (param $1 i32) (param $2 i32) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (select ;; CHECK-NEXT: (local.get $0) @@ -2040,7 +2041,7 @@ atomic.fence ) - ;; CHECK: (func $simd-extract (type $21) (param $0 v128) (result i32) + ;; CHECK: (func $simd-extract (type $22) (param $0 v128) (result i32) ;; CHECK-NEXT: (i32x4.extract_lane 3 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2050,7 +2051,7 @@ i32x4.extract_lane 3 ) - ;; CHECK: (func $simd-replace (type $11) (param $0 v128) (param $1 i32) (result v128) + ;; CHECK: (func $simd-replace (type $12) (param $0 v128) (param $1 i32) (result v128) ;; CHECK-NEXT: (i32x4.replace_lane 2 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2062,7 +2063,7 @@ i32x4.replace_lane 2 ) - ;; CHECK: (func $simd-shuffle (type $22) (param $0 v128) (param $1 v128) (result v128) + ;; CHECK: (func $simd-shuffle (type $23) (param $0 v128) (param $1 v128) (result v128) ;; CHECK-NEXT: (i8x16.shuffle 0 1 2 3 4 5 6 7 16 17 18 19 20 21 22 23 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2074,7 +2075,7 @@ i8x16.shuffle 0 1 2 3 4 5 6 7 16 17 18 19 20 21 22 23 ) - ;; CHECK: (func $simd-ternary (type $23) (param $0 v128) (param $1 v128) (param $2 v128) (result v128) + ;; CHECK: (func $simd-ternary (type $24) (param $0 v128) (param $1 v128) (param $2 v128) (result v128) ;; CHECK-NEXT: (v128.bitselect ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2088,7 +2089,7 @@ v128.bitselect ) - ;; CHECK: (func $simd-shift (type $11) (param $0 v128) (param $1 i32) (result v128) + ;; CHECK: (func $simd-shift (type $12) (param $0 v128) (param $1 i32) (result v128) ;; CHECK-NEXT: (i8x16.shl ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2121,7 +2122,7 @@ drop ) - ;; CHECK: (func $simd-load-store-lane (type $24) (param $0 i32) (param $1 i64) (param $2 v128) + ;; CHECK: (func $simd-load-store-lane (type $25) (param $0 i32) (param $1 i64) (param $2 v128) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (v128.load16_lane $mem 7 ;; CHECK-NEXT: (local.get $0) @@ -2143,7 +2144,7 @@ v128.store64_lane 3 align=4 0 ) - ;; CHECK: (func $memory-init (type $10) (param $0 i32) (param $1 i32) (param $2 i32) + ;; CHECK: (func $memory-init (type $11) (param $0 i32) (param $1 i32) (param $2 i32) ;; CHECK-NEXT: (memory.init $mem-i32 $passive ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2184,7 +2185,7 @@ data.drop $passive ) - ;; CHECK: (func $memory-copy (type $25) (param $0 i32) (param $1 i32) (param $2 i64) (param $3 i64) + ;; CHECK: (func $memory-copy (type $26) (param $0 i32) (param $1 i32) (param $2 i64) (param $3 i64) ;; CHECK-NEXT: (memory.copy $mem $mem ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2255,7 +2256,7 @@ return ) - ;; CHECK: (func $return-one (type $26) (param $0 i32) (result i32) + ;; CHECK: (func $return-one (type $27) (param $0 i32) (result i32) ;; CHECK-NEXT: (return ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2265,7 +2266,7 @@ return ) - ;; CHECK: (func $return-two (type $27) (param $0 i32) (param $1 i64) (result i32 i64) + ;; CHECK: (func $return-two (type $28) (param $0 i32) (param $1 i64) (result i32 i64) ;; CHECK-NEXT: (return ;; CHECK-NEXT: (tuple.make ;; CHECK-NEXT: (local.get $0) @@ -2279,7 +2280,7 @@ return ) - ;; CHECK: (func $return-two-first-unreachable (type $28) (param $0 i64) (result i32 i64) + ;; CHECK: (func $return-two-first-unreachable (type $29) (param $0 i64) (result i32 i64) ;; CHECK-NEXT: (return ;; CHECK-NEXT: (tuple.make ;; CHECK-NEXT: (unreachable) @@ -2293,7 +2294,7 @@ return ) - ;; CHECK: (func $return-two-second-unreachable (type $29) (param $0 i32) (result i32 i64) + ;; CHECK: (func $return-two-second-unreachable (type $30) (param $0 i32) (result i32 i64) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2310,7 +2311,7 @@ return ) - ;; CHECK: (func $ref-is-null (type $30) (param $0 anyref) (result i32) + ;; CHECK: (func $ref-is-null (type $31) (param $0 anyref) (result i32) ;; CHECK-NEXT: (ref.is_null ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2335,7 +2336,7 @@ drop ) - ;; CHECK: (func $ref-eq (type $31) (param $0 eqref) (param $1 eqref) (result i32) + ;; CHECK: (func $ref-eq (type $32) (param $0 eqref) (param $1 eqref) (result i32) ;; CHECK-NEXT: (ref.eq ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2347,7 +2348,7 @@ ref.eq ) - ;; CHECK: (func $i31-new (type $32) (param $0 i32) (result i31ref) + ;; CHECK: (func $i31-new (type $33) (param $0 i32) (result i31ref) ;; CHECK-NEXT: (ref.i31 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2357,7 +2358,7 @@ ref.i31 ) - ;; CHECK: (func $i31-get (type $33) (param $0 i31ref) + ;; CHECK: (func $i31-get (type $34) (param $0 i31ref) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (i31.get_s ;; CHECK-NEXT: (local.get $0) @@ -2504,7 +2505,7 @@ drop ) - ;; CHECK: (func $struct-new (type $34) (param $0 i32) (param $1 i64) (result (ref $pair)) + ;; CHECK: (func $struct-new (type $35) (param $0 i32) (param $1 i64) (result (ref $pair)) ;; CHECK-NEXT: (struct.new $pair ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2516,14 +2517,14 @@ struct.new $pair ) - ;; CHECK: (func $struct-new-default (type $35) (result (ref $pair)) + ;; CHECK: (func $struct-new-default (type $36) (result (ref $pair)) ;; CHECK-NEXT: (struct.new_default $pair) ;; CHECK-NEXT: ) (func $struct-new-default (result (ref $pair)) struct.new_default 14 ) - ;; CHECK: (func $struct-get-0 (type $36) (param $0 (ref $pair)) (result i32) + ;; CHECK: (func $struct-get-0 (type $37) (param $0 (ref $pair)) (result i32) ;; CHECK-NEXT: (struct.get $pair 0 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2533,7 +2534,7 @@ struct.get 14 0 ) - ;; CHECK: (func $struct-get-1 (type $37) (param $0 (ref $pair)) (result i64) + ;; CHECK: (func $struct-get-1 (type $38) (param $0 (ref $pair)) (result i64) ;; CHECK-NEXT: (struct.get $pair 1 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2543,7 +2544,7 @@ struct.get $pair 1 ) - ;; CHECK: (func $struct-set-0 (type $38) (param $0 (ref $pair)) (param $1 i32) + ;; CHECK: (func $struct-set-0 (type $39) (param $0 (ref $pair)) (param $1 i32) ;; CHECK-NEXT: (struct.set $pair 0 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2555,7 +2556,7 @@ struct.set $pair 0 ) - ;; CHECK: (func $struct-set-1 (type $39) (param $0 (ref $pair)) (param $1 i64) + ;; CHECK: (func $struct-set-1 (type $40) (param $0 (ref $pair)) (param $1 i64) ;; CHECK-NEXT: (struct.set $pair 1 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2567,7 +2568,7 @@ struct.set 14 1 ) - ;; CHECK: (func $array-new (type $40) (param $0 i64) (param $1 i32) (result (ref $a1)) + ;; CHECK: (func $array-new (type $41) (param $0 i64) (param $1 i32) (result (ref $a1)) ;; CHECK-NEXT: (array.new $a1 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2579,7 +2580,7 @@ array.new $a1 ) - ;; CHECK: (func $array-new-default (type $41) (param $0 i32) (result (ref $a1)) + ;; CHECK: (func $array-new-default (type $42) (param $0 i32) (result (ref $a1)) ;; CHECK-NEXT: (array.new_default $a1 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2589,7 +2590,7 @@ array.new_default 11 ) - ;; CHECK: (func $array-new-data (type $42) (param $0 i32) (param $1 i32) (result (ref $a1)) + ;; CHECK: (func $array-new-data (type $43) (param $0 i32) (param $1 i32) (result (ref $a1)) ;; CHECK-NEXT: (array.new_data $a1 $implicit-data ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2601,7 +2602,29 @@ array.new_data $a1 0 ) - ;; CHECK: (func $array-get (type $43) (param $0 (ref $a1)) (param $1 i32) (result i64) + ;; CHECK: (func $array-new-fixed (type $void) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (array.new_fixed $a0 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (array.new_fixed $a0 3 + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: (i32.const 1) + ;; CHECK-NEXT: (i32.const 2) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $array-new-fixed + array.new_fixed $a0 0 + drop + i32.const 0 + i32.const 1 + i32.const 2 + array.new_fixed $a0 3 + drop + ) + + ;; CHECK: (func $array-get (type $44) (param $0 (ref $a1)) (param $1 i32) (result i64) ;; CHECK-NEXT: (array.get $a1 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2613,7 +2636,7 @@ array.get $a1 ) - ;; CHECK: (func $array-get-s (type $44) (param $0 (ref $packed-i8)) (param $1 i32) (result i32) + ;; CHECK: (func $array-get-s (type $45) (param $0 (ref $packed-i8)) (param $1 i32) (result i32) ;; CHECK-NEXT: (array.get_s $packed-i8 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2625,7 +2648,7 @@ array.get_s 15 ) - ;; CHECK: (func $array-get-u (type $45) (param $0 (ref $packed-i16)) (param $1 i32) (result i32) + ;; CHECK: (func $array-get-u (type $46) (param $0 (ref $packed-i16)) (param $1 i32) (result i32) ;; CHECK-NEXT: (array.get_u $packed-i16 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2637,7 +2660,7 @@ array.get_u $packed-i16 ) - ;; CHECK: (func $array-set (type $46) (param $0 (ref $a2)) (param $1 i32) (param $2 f32) + ;; CHECK: (func $array-set (type $47) (param $0 (ref $a2)) (param $1 i32) (param $2 f32) ;; CHECK-NEXT: (array.set $a2 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2651,7 +2674,7 @@ array.set $a2 ) - ;; CHECK: (func $array-len (type $47) (param $0 arrayref) (result i32) + ;; CHECK: (func $array-len (type $48) (param $0 arrayref) (result i32) ;; CHECK-NEXT: (array.len ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) @@ -2661,7 +2684,7 @@ array.len ) - ;; CHECK: (func $array-copy (type $48) (param $0 (ref $a2)) (param $1 i32) (param $2 (ref $a2)) (param $3 i32) (param $4 i32) + ;; CHECK: (func $array-copy (type $49) (param $0 (ref $a2)) (param $1 i32) (param $2 (ref $a2)) (param $3 i32) (param $4 i32) ;; CHECK-NEXT: (array.copy $a2 $a2 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2679,7 +2702,7 @@ array.copy $a2 $a2 ) - ;; CHECK: (func $array-fill (type $49) (param $0 (ref $a2)) (param $1 i32) (param $2 f32) (param $3 i32) + ;; CHECK: (func $array-fill (type $50) (param $0 (ref $a2)) (param $1 i32) (param $2 f32) (param $3 i32) ;; CHECK-NEXT: (array.fill $a2 ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2708,7 +2731,7 @@ drop ) - ;; CHECK: (func $any-convert-extern (type $50) (param $0 externref) + ;; CHECK: (func $any-convert-extern (type $51) (param $0 externref) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (extern.internalize ;; CHECK-NEXT: (local.get $0) @@ -2734,7 +2757,7 @@ drop ) - ;; CHECK: (func $call (type $16) (param $0 i32) (param $1 i64) (result f32) + ;; CHECK: (func $call (type $17) (param $0 i32) (param $1 i64) (result f32) ;; CHECK-NEXT: (call $call ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) @@ -2746,7 +2769,7 @@ call $call ) - ;; CHECK: (func $return_call (type $16) (param $0 i32) (param $1 i64) (result f32) + ;; CHECK: (func $return_call (type $17) (param $0 i32) (param $1 i64) (result f32) ;; CHECK-NEXT: (return_call $return_call ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (local.get $1) |