Merge branch 'funcref'

proposals/function-references/Overview.md

@@ -46,6 +46,7 @@ Typed references have no canonical default value, because they cannot be null. T
 The function `$hof` takes a function pointer as parameter, and is invoked by `$caller`, passing `$inc` as argument:
 ```wasm
 (type $i32-i32 (func (param i32) (result i32)))
+(elem declare funcref (ref.func $inc))
 
 (func $hof (param $f (ref $i32-i32)) (result i32)
  (i32.add (i32.const 10) (call_ref $i32-i32 (i32.const 42) (local.get $f)))

test/core/return_call.wast

@@ -188,7 +188,15 @@
  )
  "type mismatch"
 )
-
+(assert_invalid
+ (module
+ (func $f (result i32 i32) unreachable)
+ (func (result i32)
+ return_call $f
+ )
+ )
+ "type mismatch"
+)
 
 ;; Unbound function
 

test/core/return_call_indirect.wast

@@ -508,7 +508,17 @@
  )
  "type mismatch"
 )
-
+(assert_invalid
+ (module
+ (type $ty (func (result i32 i32)))
+ (import "env" "table" (table $table 0 funcref))
+ (func (param i32) (result i32)
+ local.get 0
+ return_call_indirect $table (type $ty)
+ )
+ )
+ "type mismatch"
+)
 
 ;; Unbound type
 

test/core/return_call_ref.wast

@@ -374,3 +374,14 @@
  )
  "type mismatch"
 )
+
+(assert_invalid
+ (module
+ (type $ty (func (result i32 i32)))
+ (func (param funcref) (result i32)
+ local.get 0
+ return_call_ref $ty
+ )
+ )
+ "type mismatch"
+)