Skip to content

Commit 15422ca

Browse files
KKiiimKKiiim
committed
test
1 parent 50bf2b7 commit 15422ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+8557
-13565
lines changed

‎NOTICE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ under the licensing terms detailed in LICENSE:
6060
* Fabián Heredia Montiel <[email protected]>
6161
* Jonas Minnberg <[email protected]>
6262
* Kam Chehresa <[email protected]>
63+
* Rui Jin <[email protected]>
6364

6465
Portions of this software are derived from third-party works licensed under
6566
the following terms:

‎src/compiler.ts‎

Lines changed: 108 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10026,6 +10026,95 @@ export class Compiler extends DiagnosticEmitter {
1002610026
// === Specialized code generation ==============================================================
1002710027

1002810028
/** Makes a constant zero of the specified type. */
10029+
/** Checks if an expression evaluates to a zero value for the given type. */
10030+
shouldSkipZeroInit(expr: ExpressionRef, type: Type): bool {
10031+
let module = this.module;
10032+
// Try to evaluate the expression at compile time
10033+
let evaled = module.runExpression(expr, ExpressionRunnerFlags.Default);
10034+
if (!evaled) return false; // Can't evaluate at compile time
10035+
10036+
const evaledType = getExpressionType(evaled);
10037+
switch (type.kind) {
10038+
case TypeKind.Bool:
10039+
case TypeKind.I8:
10040+
case TypeKind.I16:
10041+
case TypeKind.I32:
10042+
case TypeKind.U8:
10043+
case TypeKind.U16:
10044+
case TypeKind.U32:
10045+
// All small integer types are represented as i32 in WebAssembly
10046+
// But we still check for safety and consistency
10047+
if (evaledType == TypeRef.I32) {
10048+
return getConstValueI32(evaled) === 0;
10049+
}
10050+
return false;
10051+
case TypeKind.I64:
10052+
case TypeKind.U64:
10053+
case TypeKind.Isize:
10054+
case TypeKind.Usize:
10055+
// Only call getConstValueI64* if the expression is actually i64
10056+
if (evaledType == TypeRef.I64) {
10057+
return getConstValueI64Low(evaled) === 0 && getConstValueI64High(evaled) === 0;
10058+
}
10059+
// For size types on 32-bit platforms, they might be i32
10060+
if (evaledType == TypeRef.I32 && (type.kind == TypeKind.Isize || type.kind == TypeKind.Usize)) {
10061+
return getConstValueI32(evaled) === 0;
10062+
}
10063+
return false;
10064+
case TypeKind.F32:
10065+
if (evaledType == TypeRef.F32) {
10066+
return getConstValueF32(evaled) === 0.0;
10067+
}
10068+
return false;
10069+
case TypeKind.F64:
10070+
if (evaledType == TypeRef.F64) {
10071+
return getConstValueF64(evaled) === 0.0;
10072+
}
10073+
return false;
10074+
default:
10075+
// For reference types, zero means null
10076+
if (type.isReference && type.is(TypeFlags.Nullable)) {
10077+
return getExpressionId(evaled) === ExpressionId.RefNull;
10078+
}
10079+
return false;
10080+
}
10081+
}
10082+
10083+
/** Checks if a field type can use the default zero-initialized memory value. */
10084+
canUseZeroDefault(type: Type): bool {
10085+
switch (type.kind) {
10086+
default: assert(false);
10087+
case TypeKind.Bool:
10088+
case TypeKind.I8:
10089+
case TypeKind.I16:
10090+
case TypeKind.I32:
10091+
case TypeKind.U8:
10092+
case TypeKind.U16:
10093+
case TypeKind.U32:
10094+
case TypeKind.I64:
10095+
case TypeKind.U64:
10096+
case TypeKind.Isize:
10097+
case TypeKind.Usize:
10098+
case TypeKind.F32:
10099+
case TypeKind.F64:
10100+
case TypeKind.V128:
10101+
return true; // Value types default to zero in zero-initialized memory
10102+
case TypeKind.Func:
10103+
case TypeKind.Extern:
10104+
case TypeKind.Any:
10105+
case TypeKind.Eq:
10106+
case TypeKind.Struct:
10107+
case TypeKind.Array:
10108+
case TypeKind.String:
10109+
case TypeKind.StringviewWTF8:
10110+
case TypeKind.StringviewWTF16:
10111+
case TypeKind.StringviewIter:
10112+
case TypeKind.I31:
10113+
// Reference types: only nullable refs can use zero (null) default
10114+
return type.is(TypeFlags.Nullable);
10115+
}
10116+
}
10117+
1002910118
makeZero(type: Type): ExpressionRef {
1003010119
let module = this.module;
1003110120
switch (type.kind) {
@@ -10372,6 +10461,7 @@ export class Compiler extends DiagnosticEmitter {
1037210461
let parameterIndex = fieldPrototype.parameterIndex;
1037310462

1037410463
// Defer non-parameter fields until parameter fields are initialized
10464+
// Since non-parameter may depend on parameter fields
1037510465
if (parameterIndex < 0) {
1037610466
if (!nonParameterFields) nonParameterFields = new Array();
1037710467
nonParameterFields.push(property);
@@ -10407,16 +10497,25 @@ export class Compiler extends DiagnosticEmitter {
1040710497
let initializerNode = fieldPrototype.initializerNode;
1040810498
assert(fieldPrototype.parameterIndex < 0);
1040910499
let setterInstance = assert(field.setterInstance);
10410-
let expr = this.makeCallDirect(setterInstance, [
10411-
module.local_get(thisLocalIndex, sizeTypeRef),
10412-
initializerNode // use initializer if present, otherwise initialize with zero
10413-
? this.compileExpression(initializerNode, fieldType, Constraints.ConvImplicit)
10414-
: this.makeZero(fieldType)
10415-
], field.identifierNode, true);
10416-
if (this.currentType != Type.void) { // in case
10417-
expr = module.drop(expr);
10500+
10501+
if (initializerNode) {
10502+
// Explicit initializer
10503+
// Check if we need to initialize this field
10504+
const valueExpr: ExpressionRef = this.compileExpression(initializerNode, fieldType, Constraints.ConvImplicit);
10505+
if (!this.shouldSkipZeroInit(valueExpr, fieldType)) {
10506+
let expr = this.makeCallDirect(setterInstance, [
10507+
module.local_get(thisLocalIndex, sizeTypeRef),
10508+
valueExpr
10509+
], field.identifierNode, true);
10510+
if (this.currentType != Type.void) { // in case
10511+
expr = module.drop(expr);
10512+
}
10513+
stmts.push(expr);
10514+
}
10515+
} else {
10516+
// No explicit initializer
10517+
assert(this.canUseZeroDefault(fieldType));
1041810518
}
10419-
stmts.push(expr);
1042010519
}
1042110520
}
1042210521

‎tests/compiler/assignment-chain.debug.wat‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,35 +2250,30 @@
22502250
local.get $ptr
22512251
return
22522252
)
2253+
(func $assignment-chain/A#set:y (param $this i32) (param $y i64)
2254+
local.get $this
2255+
local.get $y
2256+
i64.store offset=8
2257+
)
22532258
(func $assignment-chain/A#set:x (param $this i32) (param $x i64)
22542259
local.get $this
22552260
local.get $x
22562261
i64.store
22572262
)
2258-
(func $assignment-chain/A#set:y (param $this i32) (param $y i64)
2263+
(func $assignment-chain/B#get:_setter_cnt (param $this i32) (result i32)
22592264
local.get $this
2260-
local.get $y
2261-
i64.store offset=8
2265+
i32.load
22622266
)
22632267
(func $assignment-chain/B#set:_setter_cnt (param $this i32) (param $_setter_cnt i32)
22642268
local.get $this
22652269
local.get $_setter_cnt
22662270
i32.store
22672271
)
2268-
(func $assignment-chain/B#set:_getter_cnt (param $this i32) (param $_getter_cnt i32)
2269-
local.get $this
2270-
local.get $_getter_cnt
2271-
i32.store offset=4
2272-
)
22732272
(func $assignment-chain/B#set:_y (param $this i32) (param $_y f64)
22742273
local.get $this
22752274
local.get $_y
22762275
f64.store offset=8
22772276
)
2278-
(func $assignment-chain/B#get:_setter_cnt (param $this i32) (result i32)
2279-
local.get $this
2280-
i32.load
2281-
)
22822277
(func $assignment-chain/B#get:_getter_cnt (param $this i32) (result i32)
22832278
local.get $this
22842279
i32.load offset=4
@@ -2434,22 +2429,6 @@
24342429
local.get $this
24352430
local.set $1
24362431
global.get $~lib/memory/__stack_pointer
2437-
local.get $1
2438-
i32.store offset=4
2439-
local.get $1
2440-
i64.const 0
2441-
call $assignment-chain/A#set:x
2442-
local.get $this
2443-
local.set $1
2444-
global.get $~lib/memory/__stack_pointer
2445-
local.get $1
2446-
i32.store offset=4
2447-
local.get $1
2448-
i64.const 0
2449-
call $assignment-chain/A#set:y
2450-
local.get $this
2451-
local.set $1
2452-
global.get $~lib/memory/__stack_pointer
24532432
i32.const 8
24542433
i32.add
24552434
global.set $~lib/memory/__stack_pointer
@@ -2552,30 +2531,6 @@
25522531
local.get $this
25532532
local.set $1
25542533
global.get $~lib/memory/__stack_pointer
2555-
local.get $1
2556-
i32.store offset=4
2557-
local.get $1
2558-
i32.const 0
2559-
call $assignment-chain/B#set:_setter_cnt
2560-
local.get $this
2561-
local.set $1
2562-
global.get $~lib/memory/__stack_pointer
2563-
local.get $1
2564-
i32.store offset=4
2565-
local.get $1
2566-
i32.const 0
2567-
call $assignment-chain/B#set:_getter_cnt
2568-
local.get $this
2569-
local.set $1
2570-
global.get $~lib/memory/__stack_pointer
2571-
local.get $1
2572-
i32.store offset=4
2573-
local.get $1
2574-
f64.const 0
2575-
call $assignment-chain/B#set:_y
2576-
local.get $this
2577-
local.set $1
2578-
global.get $~lib/memory/__stack_pointer
25792534
i32.const 8
25802535
i32.add
25812536
global.set $~lib/memory/__stack_pointer

‎tests/compiler/assignment-chain.release.wat‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
local.get $0
123123
global.set $~lib/rt/itcms/iter
124124
end
125-
block $__inlined_func$~lib/rt/itcms/Object#unlink$129
125+
block $__inlined_func$~lib/rt/itcms/Object#unlink$124
126126
local.get $1
127127
i32.load offset=4
128128
i32.const -4
@@ -146,7 +146,7 @@
146146
call $~lib/builtins/abort
147147
unreachable
148148
end
149-
br $__inlined_func$~lib/rt/itcms/Object#unlink$129
149+
br $__inlined_func$~lib/rt/itcms/Object#unlink$124
150150
end
151151
local.get $1
152152
i32.load offset=8
@@ -1661,18 +1661,6 @@
16611661
local.tee $1
16621662
i32.store
16631663
global.get $~lib/memory/__stack_pointer
1664-
local.get $1
1665-
i32.store offset=4
1666-
local.get $1
1667-
i64.const 0
1668-
i64.store
1669-
global.get $~lib/memory/__stack_pointer
1670-
local.get $1
1671-
i32.store offset=4
1672-
local.get $1
1673-
i64.const 0
1674-
i64.store offset=8
1675-
global.get $~lib/memory/__stack_pointer
16761664
i32.const 8
16771665
i32.add
16781666
global.set $~lib/memory/__stack_pointer
@@ -1790,24 +1778,6 @@
17901778
local.tee $1
17911779
i32.store
17921780
global.get $~lib/memory/__stack_pointer
1793-
local.get $1
1794-
i32.store offset=4
1795-
local.get $1
1796-
i32.const 0
1797-
i32.store
1798-
global.get $~lib/memory/__stack_pointer
1799-
local.get $1
1800-
i32.store offset=4
1801-
local.get $1
1802-
i32.const 0
1803-
i32.store offset=4
1804-
global.get $~lib/memory/__stack_pointer
1805-
local.get $1
1806-
i32.store offset=4
1807-
local.get $1
1808-
f64.const 0
1809-
f64.store offset=8
1810-
global.get $~lib/memory/__stack_pointer
18111781
i32.const 8
18121782
i32.add
18131783
global.set $~lib/memory/__stack_pointer

0 commit comments

Comments
 (0)