Skip to content

Commit 2d31692

Browse files
dcodeIOdcodeIO
authored
Utilize new inlining utility to potentially inline any call (AssemblyScript#684)
1 parent 070d67f commit 2d31692

File tree

4 files changed

+263
-275
lines changed

4 files changed

+263
-275
lines changed

‎src/compiler.ts‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6675,10 +6675,32 @@ export class Compiler extends DiagnosticEmitter {
66756675
skipAutorelease: bool = false
66766676
): ExpressionRef {
66776677
if (instance.hasDecorator(DecoratorFlags.INLINE)) {
6678-
this.warning(
6679-
DiagnosticCode.TODO_Cannot_inline_inferred_calls_and_specific_internals_yet,
6680-
reportNode.range, instance.internalName
6681-
);
6678+
assert(!instance.is(CommonFlags.TRAMPOLINE)); // doesn't make sense
6679+
if (this.currentInlineFunctions.includes(instance)) {
6680+
this.warning(
6681+
DiagnosticCode.Function_0_cannot_be_inlined_into_itself,
6682+
reportNode.range, instance.internalName
6683+
);
6684+
} else {
6685+
this.currentInlineFunctions.push(instance);
6686+
let expr: ExpressionRef;
6687+
if (instance.is(CommonFlags.INSTANCE)) {
6688+
let theOperands = assert(operands);
6689+
assert(theOperands.length);
6690+
expr = this.makeCallInline(instance, theOperands.slice(1), theOperands[0], immediatelyDropped);
6691+
} else {
6692+
expr = this.makeCallInline(instance, operands, 0, immediatelyDropped);
6693+
}
6694+
if (this.currentType.isManaged) {
6695+
if (!skipAutorelease) {
6696+
expr = this.makeAutorelease(expr, this.currentFlow);
6697+
} else {
6698+
this.skippedAutoreleases.add(expr);
6699+
}
6700+
}
6701+
this.currentInlineFunctions.pop();
6702+
return expr;
6703+
}
66826704
}
66836705
var numOperands = operands ? operands.length : 0;
66846706
var numArguments = numOperands;

‎tests/compiler/std/operator-overloading.untouched.wat‎

Lines changed: 83 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,54 +2004,7 @@
20042004
i32.store offset=4
20052005
local.get $0
20062006
)
2007-
(func $std/operator-overloading/TesterInlineStatic.postInc (; 34 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
2008-
(local $1 i32)
2009-
local.get $0
2010-
call $~lib/rt/stub/__retain
2011-
drop
2012-
i32.const 0
2013-
local.get $0
2014-
i32.load
2015-
i32.const 1
2016-
i32.add
2017-
local.get $0
2018-
i32.load offset=4
2019-
i32.const 1
2020-
i32.add
2021-
call $std/operator-overloading/TesterInlineStatic#constructor
2022-
local.set $1
2023-
local.get $0
2024-
call $~lib/rt/stub/__release
2025-
local.get $1
2026-
)
2027-
(func $std/operator-overloading/TesterInlineStatic.add (; 35 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
2028-
(local $2 i32)
2029-
local.get $0
2030-
call $~lib/rt/stub/__retain
2031-
drop
2032-
local.get $1
2033-
call $~lib/rt/stub/__retain
2034-
drop
2035-
i32.const 0
2036-
local.get $0
2037-
i32.load
2038-
local.get $1
2039-
i32.load
2040-
i32.add
2041-
local.get $0
2042-
i32.load offset=4
2043-
local.get $1
2044-
i32.load offset=4
2045-
i32.add
2046-
call $std/operator-overloading/TesterInlineStatic#constructor
2047-
local.set $2
2048-
local.get $0
2049-
call $~lib/rt/stub/__release
2050-
local.get $1
2051-
call $~lib/rt/stub/__release
2052-
local.get $2
2053-
)
2054-
(func $std/operator-overloading/TesterInlineInstance#constructor (; 36 ;) (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
2007+
(func $std/operator-overloading/TesterInlineInstance#constructor (; 34 ;) (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
20552008
local.get $0
20562009
i32.eqz
20572010
if
@@ -2069,41 +2022,7 @@
20692022
i32.store offset=4
20702023
local.get $0
20712024
)
2072-
(func $std/operator-overloading/TesterInlineInstance#postInc (; 37 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
2073-
i32.const 0
2074-
local.get $0
2075-
i32.load
2076-
i32.const 1
2077-
i32.add
2078-
local.get $0
2079-
i32.load offset=4
2080-
i32.const 1
2081-
i32.add
2082-
call $std/operator-overloading/TesterInlineInstance#constructor
2083-
)
2084-
(func $std/operator-overloading/TesterInlineInstance#add (; 38 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
2085-
(local $2 i32)
2086-
local.get $1
2087-
call $~lib/rt/stub/__retain
2088-
drop
2089-
i32.const 0
2090-
local.get $0
2091-
i32.load
2092-
local.get $1
2093-
i32.load
2094-
i32.add
2095-
local.get $0
2096-
i32.load offset=4
2097-
local.get $1
2098-
i32.load offset=4
2099-
i32.add
2100-
call $std/operator-overloading/TesterInlineInstance#constructor
2101-
local.set $2
2102-
local.get $1
2103-
call $~lib/rt/stub/__release
2104-
local.get $2
2105-
)
2106-
(func $start:std/operator-overloading (; 39 ;) (type $FUNCSIG$v)
2025+
(func $start:std/operator-overloading (; 35 ;) (type $FUNCSIG$v)
21072026
(local $0 i32)
21082027
(local $1 i32)
21092028
(local $2 i32)
@@ -2128,6 +2047,7 @@
21282047
(local $21 i32)
21292048
(local $22 i32)
21302049
(local $23 i32)
2050+
(local $24 i32)
21312051
global.get $~lib/heap/__heap_base
21322052
i32.const 15
21332053
i32.add
@@ -3143,30 +3063,66 @@
31433063
call $std/operator-overloading/TesterInlineStatic#constructor
31443064
global.set $std/operator-overloading/ais1
31453065
global.get $std/operator-overloading/ais1
3146-
call $std/operator-overloading/TesterInlineStatic.postInc
3147-
local.tee $21
3066+
call $~lib/rt/stub/__retain
3067+
local.set $20
3068+
i32.const 0
3069+
local.get $20
3070+
i32.load
3071+
i32.const 1
3072+
i32.add
3073+
local.get $20
3074+
i32.load offset=4
3075+
i32.const 1
3076+
i32.add
3077+
call $std/operator-overloading/TesterInlineStatic#constructor
3078+
local.set $21
3079+
local.get $20
3080+
call $~lib/rt/stub/__release
3081+
local.get $21
31483082
local.tee $20
3149-
global.get $std/operator-overloading/ais1
31503083
local.tee $18
3084+
global.get $std/operator-overloading/ais1
3085+
local.tee $21
31513086
i32.ne
31523087
if
3153-
local.get $20
3088+
local.get $18
31543089
call $~lib/rt/stub/__retain
31553090
drop
3156-
local.get $18
3091+
local.get $21
31573092
call $~lib/rt/stub/__release
31583093
end
3159-
local.get $20
3094+
local.get $18
31603095
global.set $std/operator-overloading/ais1
31613096
i32.const 0
31623097
i32.const 2
31633098
i32.const 3
31643099
call $std/operator-overloading/TesterInlineStatic#constructor
31653100
global.set $std/operator-overloading/ais2
31663101
global.get $std/operator-overloading/ais1
3102+
call $~lib/rt/stub/__retain
3103+
local.set $18
31673104
global.get $std/operator-overloading/ais2
3168-
call $std/operator-overloading/TesterInlineStatic.add
3169-
local.tee $20
3105+
call $~lib/rt/stub/__retain
3106+
local.set $21
3107+
i32.const 0
3108+
local.get $18
3109+
i32.load
3110+
local.get $21
3111+
i32.load
3112+
i32.add
3113+
local.get $18
3114+
i32.load offset=4
3115+
local.get $21
3116+
i32.load offset=4
3117+
i32.add
3118+
call $std/operator-overloading/TesterInlineStatic#constructor
3119+
local.set $22
3120+
local.get $21
3121+
call $~lib/rt/stub/__release
3122+
local.get $18
3123+
call $~lib/rt/stub/__release
3124+
local.get $22
3125+
local.tee $18
31703126
call $~lib/rt/stub/__retain
31713127
global.set $std/operator-overloading/ais
31723128
global.get $std/operator-overloading/ais
@@ -3196,30 +3152,58 @@
31963152
call $std/operator-overloading/TesterInlineInstance#constructor
31973153
global.set $std/operator-overloading/aii1
31983154
global.get $std/operator-overloading/aii1
3199-
call $std/operator-overloading/TesterInlineInstance#postInc
3200-
local.tee $18
3155+
local.set $22
3156+
i32.const 0
3157+
local.get $22
3158+
i32.load
3159+
i32.const 1
3160+
i32.add
3161+
local.get $22
3162+
i32.load offset=4
3163+
i32.const 1
3164+
i32.add
3165+
call $std/operator-overloading/TesterInlineInstance#constructor
32013166
local.tee $22
3167+
local.tee $21
32023168
global.get $std/operator-overloading/aii1
32033169
local.tee $23
32043170
i32.ne
32053171
if
3206-
local.get $22
3172+
local.get $21
32073173
call $~lib/rt/stub/__retain
32083174
drop
32093175
local.get $23
32103176
call $~lib/rt/stub/__release
32113177
end
3212-
local.get $22
3178+
local.get $21
32133179
global.set $std/operator-overloading/aii1
32143180
i32.const 0
32153181
i32.const 2
32163182
i32.const 3
32173183
call $std/operator-overloading/TesterInlineInstance#constructor
32183184
global.set $std/operator-overloading/aii2
32193185
global.get $std/operator-overloading/aii1
3186+
local.set $21
32203187
global.get $std/operator-overloading/aii2
3221-
call $std/operator-overloading/TesterInlineInstance#add
3222-
local.tee $22
3188+
call $~lib/rt/stub/__retain
3189+
local.set $23
3190+
i32.const 0
3191+
local.get $21
3192+
i32.load
3193+
local.get $23
3194+
i32.load
3195+
i32.add
3196+
local.get $21
3197+
i32.load offset=4
3198+
local.get $23
3199+
i32.load offset=4
3200+
i32.add
3201+
call $std/operator-overloading/TesterInlineInstance#constructor
3202+
local.set $24
3203+
local.get $23
3204+
call $~lib/rt/stub/__release
3205+
local.get $24
3206+
local.tee $21
32233207
call $~lib/rt/stub/__retain
32243208
global.set $std/operator-overloading/aii
32253209
global.get $std/operator-overloading/aii
@@ -3290,9 +3274,9 @@
32903274
local.get $22
32913275
call $~lib/rt/stub/__release
32923276
)
3293-
(func $start (; 40 ;) (type $FUNCSIG$v)
3277+
(func $start (; 36 ;) (type $FUNCSIG$v)
32943278
call $start:std/operator-overloading
32953279
)
3296-
(func $null (; 41 ;) (type $FUNCSIG$v)
3280+
(func $null (; 37 ;) (type $FUNCSIG$v)
32973281
)
32983282
)

0 commit comments

Comments
 (0)