[stable] [dart2wasm] Fix bug in setter type checker argument checking implementation
The CL in [0] introduced a regression: By not performing the type
checking code in -O3/-O4 mode it didn't have the side-effect of the
type checking code anymore (setting the `argLocal`) which caused the setter to store `null` instead of the actual value.
[0] https://dart-review.googlesource.com/c/sdk/+/370280
Fixes https://github.com/flutter/flutter/issues/152029
TEST=web/wasm/flutter_regress_152029_test
Bug: https://github.com/flutter/flutter/issues/152029
Change-Id: Icea1ac478ff020e2056c4c7011aaea7a6222ec32
Cherry-pick: https://dart-review.googlesource.com/c/sdk/+/378800
Cherry-pick-request: https://github.com/dart-lang/sdk/issues/56374
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/378860
Reviewed-by: Ömer Ağacan <omersa@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f5a6a9..cb1ae58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,18 @@
## 3.5.1
+### Tools
+
+#### Wasm compiler (dart2wasm)
+
- Fix source maps generated by `dart compile wasm` when optimizations are
enabled.
+- Fixes a bug in the dart2wasm compiler in unsound `-O3` / `-O4` modes where a
+ implicit setter for a field of generic type will store `null` instead of the
+ field value. [#152029][]
+
+[#152029]: https://github.com/flutter/flutter/issues/152029
+
## 3.5.0
### Language
diff --git a/pkg/dart2wasm/lib/code_generator.dart b/pkg/dart2wasm/lib/code_generator.dart
index 5ee0667..630d714 100644
--- a/pkg/dart2wasm/lib/code_generator.dart
+++ b/pkg/dart2wasm/lib/code_generator.dart
@@ -434,11 +434,11 @@
b.local_set(boxedOperand);
operand = boxedOperand;
}
+ b.local_get(operand);
_generateArgumentTypeCheck(
variable.name!,
- () => b.local_get(operand),
+ operand.type as w.RefType,
variable.type,
- operand,
);
}
}
@@ -3451,9 +3451,6 @@
_initializeThis(member.reference);
- // Local for the argument.
- final argLocal = addLocal(translator.topInfo.nullableType);
-
final member_ = member;
DartType paramType;
if (member_ is Field) {
@@ -3463,11 +3460,11 @@
}
if (!translator.options.omitImplicitTypeChecks) {
+ b.local_get(positionalArgLocal);
_generateArgumentTypeCheck(
member.name.text,
- () => b.local_get(positionalArgLocal),
+ positionalArgLocal.type as w.RefType,
paramType,
- argLocal,
);
}
@@ -3477,8 +3474,8 @@
b.local_get(receiverLocal);
translator.convertType(
function, receiverLocal.type, info.nonNullableType);
- b.local_get(argLocal);
- translator.convertType(function, argLocal.type,
+ b.local_get(positionalArgLocal);
+ translator.convertType(function, positionalArgLocal.type,
info.struct.fields[fieldIndex].type.unpacked);
b.struct_set(info.struct, fieldIndex);
} else {
@@ -3489,12 +3486,13 @@
assert(setterWasmInputs.length == 2);
b.local_get(receiverLocal);
translator.convertType(function, receiverLocal.type, setterWasmInputs[0]);
- b.local_get(argLocal);
- translator.convertType(function, argLocal.type, setterWasmInputs[1]);
+ b.local_get(positionalArgLocal);
+ translator.convertType(
+ function, positionalArgLocal.type, setterWasmInputs[1]);
call(setterProcedure.reference);
}
- b.local_get(argLocal);
+ b.local_get(positionalArgLocal);
b.end(); // end function
}
@@ -3567,24 +3565,15 @@
final List<VariableDeclaration> memberPositionalParams =
procedure.function.positionalParameters;
- // Local for the current argument being checked. Used to avoid indexing
- // the positional parameters array again when throwing type error.
- final argLocal = addLocal(translator.topInfo.nullableType);
-
for (int positionalParamIdx = 0;
positionalParamIdx < memberPositionalParams.length;
positionalParamIdx += 1) {
final param = memberPositionalParams[positionalParamIdx];
+ b.local_get(positionalArgsLocal);
+ b.i32_const(positionalParamIdx);
+ b.array_get(translator.nullableObjectArrayType);
_generateArgumentTypeCheck(
- param.name!,
- () {
- b.local_get(positionalArgsLocal);
- b.i32_const(positionalParamIdx);
- b.array_get(translator.nullableObjectArrayType);
- },
- param.type,
- argLocal,
- );
+ param.name!, translator.topInfo.nullableType, param.type);
}
// Check named argument types
@@ -3607,16 +3596,11 @@
namedParamIdx < memberNamedParams.length;
namedParamIdx += 1) {
final param = memberNamedParams[namedParamIdx];
+ b.local_get(namedArgsLocal);
+ b.i32_const(mapNamedParameterToArrayIndex(param.name!));
+ b.array_get(translator.nullableObjectArrayType);
_generateArgumentTypeCheck(
- param.name!,
- () {
- b.local_get(namedArgsLocal);
- b.i32_const(mapNamedParameterToArrayIndex(param.name!));
- b.array_get(translator.nullableObjectArrayType);
- },
- param.type,
- argLocal,
- );
+ param.name!, translator.topInfo.nullableType, param.type);
}
}
@@ -3671,32 +3655,23 @@
/// Generate code that checks type of an argument against an expected type
/// and throws a `TypeError` on failure.
///
- /// Does not expect any values on stack and does not leave any values on
- /// stack.
- ///
- /// Locals [argLocal] are used to store values pushed by [pushArg]
- /// and reuse the values.
+ /// Expects a boxed object (whose type is to be checked) on the stack.
///
/// [argName] is used in the type error as the name of the argument that
/// doesn't match the expected type.
void _generateArgumentTypeCheck(
String argName,
- void Function() pushArg,
+ w.RefType argumentType,
DartType testedAgainstType,
- w.Local argLocal,
) {
if (translator.options.minify) {
// We don't need to include the name in the error message, so we can use
// the optimized `as` checks.
- pushArg();
- types.emitAsCheck(
- this,
- testedAgainstType,
- translator.coreTypes.objectNullableRawType,
- argLocal.type as w.RefType);
+ types.emitAsCheck(this, testedAgainstType,
+ translator.coreTypes.objectNullableRawType, argumentType);
b.drop();
} else {
- pushArg();
+ final argLocal = b.addLocal(argumentType, isParameter: false);
b.local_tee(argLocal);
types.emitIsTest(
this, testedAgainstType, translator.coreTypes.objectNullableRawType);
diff --git a/tests/web/wasm/flutter_regress_152029_test.dart b/tests/web/wasm/flutter_regress_152029_test.dart
new file mode 100644
index 0000000..f218730
--- /dev/null
+++ b/tests/web/wasm/flutter_regress_152029_test.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// dart2wasmOptions=--extra-compiler-option=--omit-implicit-checks
+
+import 'package:expect/expect.dart';
+
+class A<T> {
+ T? value = null;
+}
+
+main() {
+ final list = [A<String>(), 1];
+ final dynamic a = list[int.parse('0')];
+ if (int.parse('0') == 0) {
+ a.value = '42';
+ }
+ Expect.equals('42', a.value);
+}
