From 6eb6232be7b1a6dd82150fe981bb4bd7eb5b5ba0 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Mon, 16 Mar 2026 05:13:37 -0700 Subject: [PATCH] Bump wasm packages to language version 3.12. This CL is part of an effort to bump the SDK requirement to `3.12.0-0` for all the packages in `pkg` that are not published to `pub`, so that we can get better testing of the "private named parameters" feature. (Packages that *are* published to `pub` can't be safely bumped yet, because SDK 3.12 hasn't been released, and I don't want to block those packages' ability to publish useful updates to customers.) This change covers the following packages, which are owned by OWNERS_WASM: - pkg/dart2wasm - pkg/wasm_builder Changes to `pubspec.yaml` files were made manually. Changes to `.dart` files were made automatically, using `dart fix` to fix failures in the unnecessary_underscores lint. Change-Id: Ia83ba9109dcd3d488755d2df990dd2496a6a6964 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/487944 Auto-Submit: Paul Berry Commit-Queue: Daco Harkes Reviewed-by: Daco Harkes Reviewed-by: Srujan Gaddam --- pkg/dart2wasm/lib/code_generator.dart | 10 +++++----- pkg/dart2wasm/lib/constants.dart | 26 +++++++++++++------------- pkg/dart2wasm/lib/intrinsics.dart | 2 +- pkg/dart2wasm/pubspec.yaml | 2 +- pkg/wasm_builder/pubspec.yaml | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkg/dart2wasm/lib/code_generator.dart b/pkg/dart2wasm/lib/code_generator.dart index 94a81049c2a..447ec0591ef 100644 --- a/pkg/dart2wasm/lib/code_generator.dart +++ b/pkg/dart2wasm/lib/code_generator.dart @@ -1870,7 +1870,7 @@ abstract class AstCodeGenerator } } - void right([_, __]) { + void right([_, _]) { b.local_get(rightLocal); if (rightNullable) { b.ref_as_non_null(); @@ -2127,7 +2127,7 @@ abstract class AstCodeGenerator w.Label nullLabel = b.block(); translateExpression(node.receiver, translator.topType); b.br_on_null(nullLabel); - }, (_, __) {}, useUncheckedEntry: false); + }, (_, _) {}, useUncheckedEntry: false); b.br(doneLabel); b.end(); // nullLabel switch (target.name.text) { @@ -2160,7 +2160,7 @@ abstract class AstCodeGenerator _VirtualCallKind.Get, (signature) => translateExpression(node.receiver, signature.inputs.first), - (_, __) {}, + (_, _) {}, useUncheckedEntry: false); } } @@ -2231,7 +2231,7 @@ abstract class AstCodeGenerator translateExpression(node.receiver, translator.topType); b.br_on_null(nullLabel); translator.convertType(b, translator.topType, signature.inputs[0]); - }, (_, __) {}, useUncheckedEntry: false); + }, (_, _) {}, useUncheckedEntry: false); b.br(doneLabel); b.end(); // nullLabel switch (target.name.text) { @@ -2262,7 +2262,7 @@ abstract class AstCodeGenerator _VirtualCallKind.Get, (signature) => translateExpression(node.receiver, signature.inputs.first), - (_, __) {}, + (_, _) {}, useUncheckedEntry: false); } diff --git a/pkg/dart2wasm/lib/constants.dart b/pkg/dart2wasm/lib/constants.dart index 07b7579e558..32fdc5ab260 100644 --- a/pkg/dart2wasm/lib/constants.dart +++ b/pkg/dart2wasm/lib/constants.dart @@ -354,7 +354,7 @@ class Constants { final info = ConstantInfo( constant, children, - (_, __) { + (_, _) { throw StateError( 'Should not try to generate code for imported constant'); }, @@ -362,7 +362,7 @@ class Constants { needsRuntimeCanonicalization, exportByMainApp, type, - (_, __, ___) { + (_, _, _) { throw StateError( 'Should not try to generate code for imported constant'); }); @@ -727,7 +727,7 @@ class ConstantCreator extends ConstantVisitor return ConstantInfo( constant, childConstants, - forceLazyConstant ?? (_, __) => false, + forceLazyConstant ?? (_, _) => false, canBeEager, needsRuntimeCanonicalization, exportByMainApp, @@ -742,7 +742,7 @@ class ConstantCreator extends ConstantVisitor ConstantInfo? visitBoolConstant(BoolConstant constant) { ClassInfo info = translator.classInfo[translator.boxedBoolClass]!; return createConstant(constant, const [], info.nonNullableType, - canBeEager: true, (_, b, __) { + canBeEager: true, (_, b, _) { b.i32_const((info.classId as AbsoluteClassId).value); b.i32_const(constant.value ? 1 : 0); b.struct_new(info.struct); @@ -753,7 +753,7 @@ class ConstantCreator extends ConstantVisitor ConstantInfo? visitIntConstant(IntConstant constant) { ClassInfo info = translator.classInfo[translator.boxedIntClass]!; return createConstant(constant, const [], info.nonNullableType, - canBeEager: true, (_, b, __) { + canBeEager: true, (_, b, _) { b.i32_const((info.classId as AbsoluteClassId).value); b.i64_const(constant.value); b.struct_new(info.struct); @@ -764,7 +764,7 @@ class ConstantCreator extends ConstantVisitor ConstantInfo? visitDoubleConstant(DoubleConstant constant) { ClassInfo info = translator.classInfo[translator.boxedDoubleClass]!; return createConstant(constant, const [], info.nonNullableType, - canBeEager: true, (_, b, __) { + canBeEager: true, (_, b, _) { b.i32_const((info.classId as AbsoluteClassId).value); b.f64_const(constant.value); b.struct_new(info.struct); @@ -775,7 +775,7 @@ class ConstantCreator extends ConstantVisitor ConstantInfo? visitStringConstant(StringConstant constant) { ClassInfo info = translator.classInfo[translator.jsStringClass]!; return createConstant(constant, const [], info.nonNullableType, - canBeEager: true, (_, b, __) { + canBeEager: true, (_, b, _) { b.pushObjectHeaderFields(translator, info); translator.globals.readGlobal( b, @@ -856,7 +856,7 @@ class ConstantCreator extends ConstantVisitor lazy |= info.classId is RelativeClassId; return createConstant(constant, childConstants, type, canBeEager: !lazy, - (_, b, __) { + (_, b, _) { b.pushObjectHeaderFields(translator, info); for (int i = FieldIndex.objectFieldBase; i < fieldCount; i++) { Constant subConstant = subConstants[i]!; @@ -896,7 +896,7 @@ class ConstantCreator extends ConstantVisitor return createConstant( constant, childConstants, w.RefType.def(arrayType, nullable: false), - canBeEager: !tooLargeForArrayNewFixed, (_, b, __) { + canBeEager: !tooLargeForArrayNewFixed, (_, b, _) { if (tooLargeForArrayNewFixed) { // We use WasmArray for some RTT data structures. Those arrays // can get rather large and cross the 10k limit. @@ -1141,7 +1141,7 @@ class ConstantCreator extends ConstantVisitor final vtableModule = closure.vtable.enclosingModule; return constantModule != vtableModule && vtableModule != translator.mainModule.module; - }, (cinfo, b, __) { + }, (cinfo, b, _) { b.pushObjectHeaderFields(translator, closureClassInfo); translator .getDummyValuesCollectorForModule(b.moduleBuilder) @@ -1367,7 +1367,7 @@ class ConstantCreator extends ConstantVisitor } return createConstant(constant, childConstants, info.nonNullableType, - canBeEager: true, (_, b, __) { + canBeEager: true, (_, b, _) { b.pushObjectHeaderFields(translator, info); constants.instantiateConstant(b, nameConstant, stringType); b.struct_new(info.struct); @@ -1393,7 +1393,7 @@ class ConstantCreator extends ConstantVisitor return createConstant( constant, childConstants, recordClassInfo.nonNullableType, - canBeEager: true, (_, b, __) { + canBeEager: true, (_, b, _) { b.pushObjectHeaderFields(translator, recordClassInfo); for (Constant argument in arguments) { constants.instantiateConstant(b, argument, translator.topType); @@ -1422,7 +1422,7 @@ class ConstantCreator extends ConstantVisitor return createConstant( constant, childConstants, w.RefType(type, nullable: false), - canBeEager: true, (_, b, __) { + canBeEager: true, (_, b, _) { translator.instantiateDummyValueHeapType(b, type, constant.name, (ib, heapType) { constants.instantiateConstant( diff --git a/pkg/dart2wasm/lib/intrinsics.dart b/pkg/dart2wasm/lib/intrinsics.dart index 56b940b936e..7273246c7d0 100644 --- a/pkg/dart2wasm/lib/intrinsics.dart +++ b/pkg/dart2wasm/lib/intrinsics.dart @@ -2866,7 +2866,7 @@ class Intrinsifier { b.if_([], [translator.nullableObjectArrayTypeRef]); translator.makeArray( - b, translator.nullableObjectArrayType, 0, (_, __) {}); + b, translator.nullableObjectArrayType, 0, (_, _) {}); b.else_(); // List argument may be a custom list type, convert it to `WasmListBase` diff --git a/pkg/dart2wasm/pubspec.yaml b/pkg/dart2wasm/pubspec.yaml index 3a869034116..64253fd6a0a 100644 --- a/pkg/dart2wasm/pubspec.yaml +++ b/pkg/dart2wasm/pubspec.yaml @@ -2,7 +2,7 @@ name: dart2wasm # This package is not intended for consumption on pub.dev. DO NOT publish. publish_to: none environment: - sdk: ^3.6.0 + sdk: '^3.12.0-0' resolution: workspace diff --git a/pkg/wasm_builder/pubspec.yaml b/pkg/wasm_builder/pubspec.yaml index 88218f71ba2..6d0d530b3ca 100644 --- a/pkg/wasm_builder/pubspec.yaml +++ b/pkg/wasm_builder/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none description: Generate binary Wasm modules environment: - sdk: ^3.5.0 + sdk: '^3.12.0-0' resolution: workspace