Infer function expressions in matching contexts (#514)

* legalizes omitting types on function expressions within function type contexts
* legalizes omitting any number of arguments
This commit is contained in:
Daniel Wirtz
2019-02-27 21:45:36 +01:00
committed by GitHub
parent 2945af6557
commit e8b0767143
29 changed files with 1349 additions and 701 deletions

View File

@ -3,11 +3,12 @@
(type $iiii_ (func (param i32 i32 i32 i32)))
(type $_ (func))
(type $i (func (result i32)))
(type $iii (func (param i32 i32) (result i32)))
(import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
(memory $0 1)
(data (i32.const 8) "\16\00\00\00f\00u\00n\00c\00t\00i\00o\00n\00-\00e\00x\00p\00r\00e\00s\00s\00i\00o\00n\00.\00t\00s\00")
(table $0 5 funcref)
(elem (i32.const 0) $null $start:function-expression~anonymous|1 $start:function-expression~anonymous|2 $start:function-expression~someName|3 $start:function-expression~anonymous|4)
(table $0 11 funcref)
(elem (i32.const 0) $null $start:function-expression~anonymous|0 $start:function-expression~anonymous|1 $start:function-expression~someName $start:function-expression~anonymous|2 $start:function-expression~anonymous|3 $start:function-expression~anonymous|4 $start:function-expression~anonymous|5 $function-expression/testOmittedReturn1~anonymous|0 $function-expression/testOmittedReturn2~anonymous|0 $function-expression/testOmittedReturn3~anonymous|0)
(global $function-expression/f1 (mut i32) (i32.const 1))
(global $~lib/argc (mut i32) (i32.const 0))
(global $function-expression/f2 (mut i32) (i32.const 2))
@ -17,19 +18,58 @@
(export "memory" (memory $0))
(export "table" (table $0))
(start $start)
(func $start:function-expression~anonymous|1 (; 1 ;) (type $ii) (param $0 i32) (result i32)
(func $start:function-expression~anonymous|0 (; 1 ;) (type $ii) (param $0 i32) (result i32)
local.get $0
)
(func $start:function-expression~anonymous|2 (; 2 ;) (type $ii) (param $0 i32) (result i32)
(func $start:function-expression~anonymous|1 (; 2 ;) (type $ii) (param $0 i32) (result i32)
local.get $0
)
(func $start:function-expression~someName|3 (; 3 ;) (type $_)
(func $start:function-expression~someName (; 3 ;) (type $_)
nop
)
(func $start:function-expression~anonymous|4 (; 4 ;) (type $i) (result i32)
(func $start:function-expression~anonymous|2 (; 4 ;) (type $i) (result i32)
i32.const 1
)
(func $start:function-expression (; 5 ;) (type $_)
(func $start:function-expression~anonymous|3 (; 5 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
local.get $0
local.get $1
i32.add
)
(func $function-expression/testOmitted (; 6 ;) (type $ii) (param $0 i32) (result i32)
i32.const 2
global.set $~lib/argc
i32.const 1
i32.const 2
local.get $0
call_indirect (type $iii)
)
(func $start:function-expression~anonymous|4 (; 7 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
local.get $0
)
(func $start:function-expression~anonymous|5 (; 8 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
i32.const 42
)
(func $function-expression/testOmittedReturn1~anonymous|0 (; 9 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
local.get $0
local.get $1
i32.add
)
(func $function-expression/testOmittedReturn1 (; 10 ;) (type $i) (result i32)
i32.const 8
)
(func $function-expression/testOmittedReturn2~anonymous|0 (; 11 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
local.get $0
)
(func $function-expression/testOmittedReturn2 (; 12 ;) (type $i) (result i32)
i32.const 9
)
(func $function-expression/testOmittedReturn3~anonymous|0 (; 13 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
i32.const 42
)
(func $function-expression/testOmittedReturn3 (; 14 ;) (type $i) (result i32)
i32.const 10
)
(func $start:function-expression (; 15 ;) (type $_)
block (result i32)
i32.const 1
global.set $~lib/argc
@ -89,10 +129,106 @@
call $~lib/env/abort
unreachable
end
i32.const 5
call $function-expression/testOmitted
i32.const 3
i32.eq
i32.eqz
if
i32.const 0
i32.const 8
i32.const 21
i32.const 0
call $~lib/env/abort
unreachable
end
i32.const 6
call $function-expression/testOmitted
i32.const 1
i32.eq
i32.eqz
if
i32.const 0
i32.const 8
i32.const 22
i32.const 0
call $~lib/env/abort
unreachable
end
i32.const 7
call $function-expression/testOmitted
i32.const 42
i32.eq
i32.eqz
if
i32.const 0
i32.const 8
i32.const 23
i32.const 0
call $~lib/env/abort
unreachable
end
block (result i32)
i32.const 2
global.set $~lib/argc
i32.const 1
i32.const 2
call $function-expression/testOmittedReturn1
call_indirect (type $iii)
end
i32.const 3
i32.eq
i32.eqz
if
i32.const 0
i32.const 8
i32.const 34
i32.const 0
call $~lib/env/abort
unreachable
end
block (result i32)
i32.const 2
global.set $~lib/argc
i32.const 1
i32.const 2
call $function-expression/testOmittedReturn2
call_indirect (type $iii)
end
i32.const 1
i32.eq
i32.eqz
if
i32.const 0
i32.const 8
i32.const 35
i32.const 0
call $~lib/env/abort
unreachable
end
block (result i32)
i32.const 2
global.set $~lib/argc
i32.const 1
i32.const 2
call $function-expression/testOmittedReturn3
call_indirect (type $iii)
end
i32.const 42
i32.eq
i32.eqz
if
i32.const 0
i32.const 8
i32.const 36
i32.const 0
call $~lib/env/abort
unreachable
end
)
(func $start (; 6 ;) (type $_)
(func $start (; 16 ;) (type $_)
call $start:function-expression
)
(func $null (; 7 ;) (type $_)
(func $null (; 17 ;) (type $_)
)
)