Rework resolver (#489)

* Rework IR and resolver to use nested lookup tables
* Integrate types into IR
* Make components prefer IR, slimmed down AST
* Implement `export *`
* Add `@lazy` annotation and remove `--noTreeShaking`
* Add `@start` annotation and remove magic `main`
* Related refactoring, cleanup and docs
This commit is contained in:
Daniel Wirtz
2019-02-21 00:11:22 +01:00
committed by GitHub
parent e623786b42
commit 0c64f21250
234 changed files with 16949 additions and 37871 deletions

View File

@ -1,8 +1,8 @@
(module
(type $_ (func))
(type $i_ (func (param i32)))
(type $ii (func (param i32) (result i32)))
(type $ii_ (func (param i32 i32)))
(type $_ (func))
(type $iii (func (param i32 i32) (result i32)))
(type $iii_ (func (param i32 i32 i32)))
(type $iiii_ (func (param i32 i32 i32 i32)))
@ -15,33 +15,33 @@
(data (i32.const 104) "\00\00\00\00\00\00\00\00\05\00\00\00\00\00\00\00\1c\00\00\00~\00l\00i\00b\00/\00i\00n\00t\00e\00r\00n\00a\00l\00/\00a\00r\00r\00a\00y\00b\00u\00f\00f\00e\00r\00.\00t\00s\00")
(table $0 7 funcref)
(elem (i32.const 0) $null $~lib/arraybuffer/ArrayBuffer~gc $~lib/array/Array<Foo>~gc $~lib/collector/itcm/__gc_mark $std/gc-array/Foo~gc $~lib/string/String~gc $~lib/internal/arraybuffer/__gc)
(global $~lib/internal/allocator/AL_BITS i32 (i32.const 3))
(global $~lib/internal/allocator/AL_SIZE i32 (i32.const 8))
(global $~lib/internal/allocator/AL_MASK i32 (i32.const 7))
(global $~lib/internal/allocator/MAX_SIZE_32 i32 (i32.const 1073741824))
(global $~lib/allocator/arena/startOffset (mut i32) (i32.const 0))
(global $~lib/allocator/arena/offset (mut i32) (i32.const 0))
(global $~lib/collector/itcm/TRACE i32 (i32.const 0))
(global $~lib/collector/itcm/HEADER_SIZE i32 (i32.const 16))
(global $~lib/collector/itcm/State.INIT i32 (i32.const 0))
(global $~lib/collector/itcm/State.IDLE i32 (i32.const 1))
(global $~lib/collector/itcm/State.MARK i32 (i32.const 2))
(global $~lib/collector/itcm/State.SWEEP i32 (i32.const 3))
(global $~lib/collector/itcm/state (mut i32) (i32.const 0))
(global $~lib/collector/itcm/white (mut i32) (i32.const 0))
(global $~lib/collector/itcm/fromSpace (mut i32) (i32.const 0))
(global $~lib/collector/itcm/toSpace (mut i32) (i32.const 0))
(global $~lib/collector/itcm/iter (mut i32) (i32.const 0))
(global $~lib/internal/arraybuffer/HEADER_SIZE i32 (i32.const 8))
(global $std/gc-array/arr (mut i32) (i32.const 48))
(global $~argc (mut i32) (i32.const 0))
(global $~lib/internal/arraybuffer/MAX_BLENGTH i32 (i32.const 1073741816))
(global $~started (mut i32) (i32.const 0))
(global $HEAP_BASE i32 (i32.const 180))
(global $~lib/argc (mut i32) (i32.const 0))
(global $~lib/started (mut i32) (i32.const 0))
(global $~lib/memory/HEAP_BASE i32 (i32.const 180))
(export "memory" (memory $0))
(export "table" (table $0))
(export "main" (func $std/gc-array/main))
(func $~lib/arraybuffer/ArrayBuffer~gc (; 1 ;) (type $i_) (param $0 i32)
(func $start:~lib/allocator/arena (; 1 ;) (type $_)
global.get $~lib/memory/HEAP_BASE
i32.const 7
i32.add
i32.const 7
i32.const -1
i32.xor
i32.and
global.set $~lib/allocator/arena/startOffset
global.get $~lib/allocator/arena/startOffset
global.set $~lib/allocator/arena/offset
)
(func $~lib/arraybuffer/ArrayBuffer~gc (; 2 ;) (type $i_) (param $0 i32)
local.get $0
i32.eqz
if
@ -50,13 +50,13 @@
local.get $0
call $~lib/collector/itcm/__gc_mark
)
(func $~lib/collector/itcm/ManagedObject#get:color (; 2 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/collector/itcm/ManagedObject#get:color (; 3 ;) (type $ii) (param $0 i32) (result i32)
local.get $0
i32.load
i32.const 3
i32.and
)
(func $~lib/collector/itcm/ManagedObject#get:next (; 3 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/collector/itcm/ManagedObject#get:next (; 4 ;) (type $ii) (param $0 i32) (result i32)
local.get $0
i32.load
i32.const 3
@ -64,7 +64,7 @@
i32.xor
i32.and
)
(func $~lib/collector/itcm/ManagedObject#set:next (; 4 ;) (type $ii_) (param $0 i32) (param $1 i32)
(func $~lib/collector/itcm/ManagedObject#set:next (; 5 ;) (type $ii_) (param $0 i32) (param $1 i32)
local.get $0
local.get $1
local.get $0
@ -74,7 +74,7 @@
i32.or
i32.store
)
(func $~lib/collector/itcm/ManagedObject#unlink (; 5 ;) (type $i_) (param $0 i32)
(func $~lib/collector/itcm/ManagedObject#unlink (; 6 ;) (type $i_) (param $0 i32)
(local $1 i32)
(local $2 i32)
local.get $0
@ -90,7 +90,7 @@
local.get $1
call $~lib/collector/itcm/ManagedObject#set:next
)
(func $~lib/collector/itcm/ManagedObjectList#push (; 6 ;) (type $ii_) (param $0 i32) (param $1 i32)
(func $~lib/collector/itcm/ManagedObjectList#push (; 7 ;) (type $ii_) (param $0 i32) (param $1 i32)
(local $2 i32)
local.get $0
i32.load offset=4
@ -108,7 +108,7 @@
local.get $1
i32.store offset=4
)
(func $~lib/collector/itcm/ManagedObject#makeGray (; 7 ;) (type $i_) (param $0 i32)
(func $~lib/collector/itcm/ManagedObject#makeGray (; 8 ;) (type $i_) (param $0 i32)
local.get $0
global.get $~lib/collector/itcm/iter
i32.eq
@ -133,7 +133,7 @@
i32.or
i32.store
)
(func $~lib/collector/itcm/__gc_mark (; 8 ;) (type $i_) (param $0 i32)
(func $~lib/collector/itcm/__gc_mark (; 9 ;) (type $i_) (param $0 i32)
(local $1 i32)
local.get $0
if
@ -141,7 +141,7 @@
local.get $0
local.set $1
local.get $1
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
i32.sub
end
local.set $1
@ -155,7 +155,7 @@
end
end
)
(func $~lib/array/Array<Foo>~gc (; 9 ;) (type $i_) (param $0 i32)
(func $~lib/array/Array<Foo>~gc (; 10 ;) (type $i_) (param $0 i32)
(local $1 i32)
(local $2 i32)
(local $3 i32)
@ -193,7 +193,7 @@
end
end
)
(func $~lib/allocator/arena/__memory_allocate (; 10 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/allocator/arena/__memory_allocate (; 11 ;) (type $ii) (param $0 i32) (result i32)
(local $1 i32)
(local $2 i32)
(local $3 i32)
@ -201,7 +201,7 @@
(local $5 i32)
(local $6 i32)
local.get $0
global.get $~lib/internal/allocator/MAX_SIZE_32
i32.const 1073741824
i32.gt_u
if
unreachable
@ -218,9 +218,9 @@
i32.gt_u
select
i32.add
global.get $~lib/internal/allocator/AL_MASK
i32.const 7
i32.add
global.get $~lib/internal/allocator/AL_MASK
i32.const 7
i32.const -1
i32.xor
i32.and
@ -272,7 +272,7 @@
global.set $~lib/allocator/arena/offset
local.get $1
)
(func $~lib/collector/itcm/ManagedObjectList#clear (; 11 ;) (type $i_) (param $0 i32)
(func $~lib/collector/itcm/ManagedObjectList#clear (; 12 ;) (type $i_) (param $0 i32)
local.get $0
local.get $0
i32.store
@ -280,7 +280,7 @@
local.get $0
i32.store offset=4
)
(func $~lib/collector/itcm/ManagedObject#set:color (; 12 ;) (type $ii_) (param $0 i32) (param $1 i32)
(func $~lib/collector/itcm/ManagedObject#set:color (; 13 ;) (type $ii_) (param $0 i32) (param $1 i32)
local.get $0
local.get $0
i32.load
@ -292,10 +292,10 @@
i32.or
i32.store
)
(func $~lib/allocator/arena/__memory_free (; 13 ;) (type $i_) (param $0 i32)
(func $~lib/allocator/arena/__memory_free (; 14 ;) (type $i_) (param $0 i32)
nop
)
(func $~lib/collector/itcm/step (; 14 ;) (type $_)
(func $~lib/collector/itcm/step (; 15 ;) (type $_)
(local $0 i32)
(local $1 i32)
block $break|0
@ -306,26 +306,26 @@
global.get $~lib/collector/itcm/state
local.set $1
local.get $1
global.get $~lib/collector/itcm/State.INIT
i32.const 0
i32.eq
br_if $case0|0
local.get $1
global.get $~lib/collector/itcm/State.IDLE
i32.const 1
i32.eq
br_if $case1|0
local.get $1
global.get $~lib/collector/itcm/State.MARK
i32.const 2
i32.eq
br_if $case2|0
local.get $1
global.get $~lib/collector/itcm/State.SWEEP
i32.const 3
i32.eq
br_if $case3|0
br $break|0
end
block
block $~lib/memory/memory.allocate|inlined.0 (result i32)
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
local.set $1
local.get $1
call $~lib/allocator/arena/__memory_allocate
@ -338,7 +338,7 @@
global.get $~lib/collector/itcm/fromSpace
call $~lib/collector/itcm/ManagedObjectList#clear
block $~lib/memory/memory.allocate|inlined.1 (result i32)
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
local.set $1
local.get $1
call $~lib/allocator/arena/__memory_allocate
@ -352,14 +352,14 @@
call $~lib/collector/itcm/ManagedObjectList#clear
global.get $~lib/collector/itcm/toSpace
global.set $~lib/collector/itcm/iter
global.get $~lib/collector/itcm/State.IDLE
i32.const 1
global.set $~lib/collector/itcm/state
end
end
block
i32.const 3
call $~iterateRoots
global.get $~lib/collector/itcm/State.MARK
i32.const 2
global.set $~lib/collector/itcm/state
br $break|0
unreachable
@ -381,12 +381,12 @@
i32.eqz
call $~lib/collector/itcm/ManagedObject#set:color
i32.const 1
global.set $~argc
global.set $~lib/argc
block $~lib/collector/itcm/objToRef|inlined.0 (result i32)
local.get $0
local.set $1
local.get $1
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
i32.add
end
local.get $0
@ -414,7 +414,7 @@
local.get $1
call $~lib/collector/itcm/ManagedObject#get:next
global.set $~lib/collector/itcm/iter
global.get $~lib/collector/itcm/State.SWEEP
i32.const 3
global.set $~lib/collector/itcm/state
end
end
@ -434,7 +434,7 @@
call $~lib/collector/itcm/ManagedObject#get:next
global.set $~lib/collector/itcm/iter
local.get $0
global.get $HEAP_BASE
global.get $~lib/memory/HEAP_BASE
i32.ge_u
if
block $~lib/memory/memory.free|inlined.0
@ -448,7 +448,7 @@
else
global.get $~lib/collector/itcm/toSpace
call $~lib/collector/itcm/ManagedObjectList#clear
global.get $~lib/collector/itcm/State.IDLE
i32.const 1
global.set $~lib/collector/itcm/state
end
br $break|0
@ -457,7 +457,7 @@
unreachable
end
)
(func $~lib/collector/itcm/__gc_collect (; 15 ;) (type $_)
(func $~lib/collector/itcm/__gc_collect (; 16 ;) (type $_)
(local $0 i32)
block $break|0
block $case1|0
@ -465,11 +465,11 @@
global.get $~lib/collector/itcm/state
local.set $0
local.get $0
global.get $~lib/collector/itcm/State.INIT
i32.const 0
i32.eq
br_if $case0|0
local.get $0
global.get $~lib/collector/itcm/State.IDLE
i32.const 1
i32.eq
br_if $case1|0
br $break|0
@ -480,7 +480,7 @@
block $break|1
loop $continue|1
global.get $~lib/collector/itcm/state
global.get $~lib/collector/itcm/State.IDLE
i32.const 1
i32.ne
if
call $~lib/collector/itcm/step
@ -489,16 +489,16 @@
end
end
)
(func $~lib/gc/gc.collect (; 16 ;) (type $_)
(func $~lib/gc/gc.collect (; 17 ;) (type $_)
call $~lib/collector/itcm/__gc_collect
return
)
(func $~lib/collector/itcm/__gc_allocate (; 17 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/collector/itcm/__gc_allocate (; 18 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
local.get $0
global.get $~lib/internal/allocator/MAX_SIZE_32
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 1073741824
i32.const 16
i32.sub
i32.gt_u
if
@ -506,7 +506,7 @@
end
call $~lib/collector/itcm/step
block $~lib/memory/memory.allocate|inlined.2 (result i32)
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
local.get $0
i32.add
local.set $2
@ -528,11 +528,11 @@
local.get $3
local.set $2
local.get $2
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
i32.add
end
)
(func $std/gc-array/Foo~gc (; 18 ;) (type $i_) (param $0 i32)
(func $std/gc-array/Foo~gc (; 19 ;) (type $i_) (param $0 i32)
local.get $0
i32.eqz
if
@ -541,7 +541,7 @@
local.get $0
call $~lib/collector/itcm/__gc_mark
)
(func $~lib/string/String~gc (; 19 ;) (type $i_) (param $0 i32)
(func $~lib/string/String~gc (; 20 ;) (type $i_) (param $0 i32)
local.get $0
i32.eqz
if
@ -550,11 +550,11 @@
local.get $0
call $~lib/collector/itcm/__gc_mark
)
(func $~lib/internal/arraybuffer/computeSize (; 20 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/internal/arraybuffer/computeSize (; 21 ;) (type $ii) (param $0 i32) (result i32)
i32.const 1
i32.const 32
local.get $0
global.get $~lib/internal/arraybuffer/HEADER_SIZE
i32.const 8
i32.add
i32.const 1
i32.sub
@ -562,13 +562,13 @@
i32.sub
i32.shl
)
(func $~lib/internal/arraybuffer/__gc (; 21 ;) (type $i_) (param $0 i32)
(func $~lib/internal/arraybuffer/__gc (; 22 ;) (type $i_) (param $0 i32)
nop
)
(func $~lib/internal/arraybuffer/allocateUnsafe (; 22 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/internal/arraybuffer/allocateUnsafe (; 23 ;) (type $ii) (param $0 i32) (result i32)
(local $1 i32)
local.get $0
global.get $~lib/internal/arraybuffer/MAX_BLENGTH
i32.const 1073741816
i32.le_u
i32.eqz
if
@ -589,7 +589,7 @@
i32.store
local.get $1
)
(func $~lib/internal/memory/memcpy (; 23 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/internal/memory/memcpy (; 24 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -1790,7 +1790,7 @@
i32.store8
end
)
(func $~lib/internal/memory/memmove (; 24 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/internal/memory/memmove (; 25 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
local.get $0
local.get $1
@ -2017,7 +2017,7 @@
end
end
)
(func $~lib/internal/memory/memset (; 25 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/internal/memory/memset (; 26 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i64)
@ -2271,7 +2271,7 @@
end
end
)
(func $~lib/internal/arraybuffer/reallocateUnsafe (; 26 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/internal/arraybuffer/reallocateUnsafe (; 27 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@ -2285,7 +2285,7 @@
i32.gt_s
if
local.get $1
global.get $~lib/internal/arraybuffer/MAX_BLENGTH
i32.const 1073741816
i32.le_s
i32.eqz
if
@ -2299,7 +2299,7 @@
local.get $1
local.get $2
call $~lib/internal/arraybuffer/computeSize
global.get $~lib/internal/arraybuffer/HEADER_SIZE
i32.const 8
i32.sub
i32.le_s
if
@ -2310,13 +2310,13 @@
local.get $1
call $~lib/internal/arraybuffer/allocateUnsafe
local.set $3
block $memory.copy|inlined.0
block $~lib/memory/memory.copy|inlined.0
local.get $3
global.get $~lib/internal/arraybuffer/HEADER_SIZE
i32.const 8
i32.add
local.set $4
local.get $0
global.get $~lib/internal/arraybuffer/HEADER_SIZE
i32.const 8
i32.add
local.set $5
local.get $2
@ -2329,9 +2329,9 @@
local.get $3
local.set $0
end
block $memory.fill|inlined.0
block $~lib/memory/memory.fill|inlined.0
local.get $0
global.get $~lib/internal/arraybuffer/HEADER_SIZE
i32.const 8
i32.add
local.get $2
i32.add
@ -2371,14 +2371,14 @@
end
local.get $0
)
(func $~lib/collector/itcm/__gc_link (; 27 ;) (type $ii_) (param $0 i32) (param $1 i32)
(func $~lib/collector/itcm/__gc_link (; 28 ;) (type $ii_) (param $0 i32) (param $1 i32)
(local $2 i32)
(local $3 i32)
block $~lib/collector/itcm/refToObj|inlined.1 (result i32)
local.get $0
local.set $2
local.get $2
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
i32.sub
end
local.set $3
@ -2393,7 +2393,7 @@
local.get $1
local.set $2
local.get $2
global.get $~lib/collector/itcm/HEADER_SIZE
i32.const 16
i32.sub
end
call $~lib/collector/itcm/ManagedObject#get:color
@ -2407,7 +2407,7 @@
call $~lib/collector/itcm/ManagedObject#makeGray
end
)
(func $~lib/array/Array<Foo>#__set (; 28 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/array/Array<Foo>#__set (; 29 ;) (type $iii_) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -2477,32 +2477,11 @@
local.get $2
call $~lib/collector/itcm/__gc_link
)
(func $std/gc-array/main (; 29 ;) (type $i) (result i32)
global.get $~started
i32.eqz
if
call $start
i32.const 1
global.set $~started
end
i32.const 0
)
(func $start (; 30 ;) (type $_)
(func $start:std/gc-array (; 30 ;) (type $_)
(local $0 i32)
(local $1 i32)
(local $2 i32)
global.get $HEAP_BASE
global.get $~lib/internal/allocator/AL_MASK
i32.add
global.get $~lib/internal/allocator/AL_MASK
i32.const -1
i32.xor
i32.and
global.set $~lib/allocator/arena/startOffset
global.get $~lib/allocator/arena/startOffset
global.set $~lib/allocator/arena/offset
global.get $~lib/collector/itcm/State.INIT
global.set $~lib/collector/itcm/state
call $start:~lib/allocator/arena
call $~lib/gc/gc.collect
global.get $std/gc-array/arr
i32.const 0
@ -2538,9 +2517,22 @@
call $~lib/array/Array<Foo>#__set
call $~lib/gc/gc.collect
)
(func $null (; 31 ;) (type $_)
(func $std/gc-array/main (; 31 ;) (type $i) (result i32)
global.get $~lib/started
i32.eqz
if
call $start
i32.const 1
global.set $~lib/started
end
i32.const 0
)
(func $~iterateRoots (; 32 ;) (type $i_) (param $0 i32)
(func $start (; 32 ;) (type $_)
call $start:std/gc-array
)
(func $null (; 33 ;) (type $_)
)
(func $~iterateRoots (; 34 ;) (type $i_) (param $0 i32)
global.get $std/gc-array/arr
local.get $0
call_indirect (type $i_)