Version 2.19.0-342.0.dev

Merge 7e87efd into dev

Author: Dart CI

pkg/dart2wasm/lib/dynamic_dispatch.dart

@@ -164,8 +164,10 @@ class DynamicDispatcher {
     w.Instructions b = function.body;
     w.Local addLocal(w.ValueType type) => function.addLocal(type);
 
-    Iterable<SelectorInfo>? selectors =
-        translator.dispatchTable.selectorsForDynamicNode(node);
+    // We make a copy of the list of selectors to avoid concurrent
+    // modification.
+    List<SelectorInfo> selectors =
+        translator.dispatchTable.selectorsForDynamicNode(node)?.toList() ?? [];
 
     // Test the receiver's class ID against every class that implements a given
     // selector. If there is a match then invoke the selector, otherwise calls
@@ -179,47 +181,43 @@ class DynamicDispatcher {
     b.local_get(receiverVar);
     b.struct_get(translator.topInfo.struct, FieldIndex.classId);
     b.local_set(cidLocal);
-    if (selectors != null) {
-      // We make a copy of the list of selectors to avoid concurrent
-      // modification.
-      for (SelectorInfo selector in selectors.toList()) {
-        if (!preSelector(selector)) {
-          continue;
-        }
-        translator.functions.activateSelector(selector);
-        for (int classID in selector.classIds) {
-          b.local_get(cidLocal);
-          b.i32_const(classID);
-          b.i32_eq();
-          b.if_();
-
-          // TODO(joshualitt): We should be able to make this a direct
-          // invocation. However, there appear to be corner cases today where we
-          // still need to do the actual invocation as an indirect call, for
-          // example if the procedure we are invoking is abstract.
-          b.comment("Dynamic invocation of '${selector.name}'");
-          b.local_get(receiverVar);
-          translator.convertType(function, translator.topInfo.nullableType,
-              selector.signature.inputs[0]);
-
-          pushArguments(selector);
-          b.local_get(cidLocal);
-          int offset = selector.offset!;
-          if (offset != 0) {
-            b.i32_const(offset);
-            b.i32_add();
-          }
-          b.call_indirect(selector.signature);
-
-          w.ValueType result =
-              translator.outputOrVoid(selector.signature.outputs);
-          translator.convertType(
-              function, result, translator.topInfo.nullableType);
-          onCallSuccess();
-          b.end(); // end if
+    for (SelectorInfo selector in selectors) {
+      if (!preSelector(selector)) {
+        continue;
+      }
+      translator.functions.activateSelector(selector);
+      for (int classID in selector.classIds) {
+        b.local_get(cidLocal);
+        b.i32_const(classID);
+        b.i32_eq();
+        b.if_();
+
+        // TODO(joshualitt): We should be able to make this a direct
+        // invocation. However, there appear to be corner cases today where we
+        // still need to do the actual invocation as an indirect call, for
+        // example if the procedure we are invoking is abstract.
+        b.comment("Dynamic invocation of '${selector.name}'");
+        b.local_get(receiverVar);
+        translator.convertType(function, translator.topInfo.nullableType,
+            selector.signature.inputs[0]);
+
+        pushArguments(selector);
+        b.local_get(cidLocal);
+        int offset = selector.offset!;
+        if (offset != 0) {
+          b.i32_const(offset);
+          b.i32_add();
         }
-        postSelector();
+        b.call_indirect(selector.signature);
+
+        w.ValueType result =
+            translator.outputOrVoid(selector.signature.outputs);
+        translator.convertType(
+            function, result, translator.topInfo.nullableType);
+        onCallSuccess();
+        b.end(); // end if
       }
+      postSelector();
     }
 
     // Handle the case where no test succeeded.

sdk/lib/_internal/wasm/lib/class_id.dart

@@ -22,6 +22,14 @@ class ClassID {
   external static int get cidFunction;
   @pragma("wasm:class-id", "dart.core#_Function")
   external static int get cid_Function;
+  @pragma("wasm:class-id", "dart.core#_List")
+  external static int get cidFixedLengthList;
+  @pragma("wasm:class-id", "dart.core#_ListBase")
+  external static int get cidListBase;
+  @pragma("wasm:class-id", "dart.core#_GrowableList")
+  external static int get cidGrowableList;
+  @pragma("wasm:class-id", "dart.core#_ImmutableList")
+  external static int get cidImmutableList;
 
   // Class IDs for RTI Types.
   @pragma("wasm:class-id", "dart.core#_NeverType")

sdk/lib/_internal/wasm/lib/errors_patch.dart

@@ -10,7 +10,7 @@ external Never _throwObjectWithStackTrace(Object error, StackTrace stacktrace);
 class Error {
   @patch
   static String _objectToString(Object object) {
-    return 'Instance of ${object._runtimeType}';
+    return "Instance of '${object._runtimeType}'";
   }
 
   @patch

sdk/lib/_internal/wasm/lib/list.dart

@@ -18,6 +18,7 @@ abstract class _ListBase<E> extends ListBase<E> {
   _ListBase._withData(this._length, this._data);
 
   E operator [](int index) {
+    RangeError.checkValidIndex(index, this, "[]", _length);
     return unsafeCast(_data.read(index));
   }
 
@@ -51,6 +52,7 @@ abstract class _ModifiableList<E> extends _ListBase<E> {
       : super._withData(length, data);
 
   void operator []=(int index, E value) {
+    RangeError.checkValidIndex(index, this, "[]=", _length);
     _data.write(index, value);
   }
 

sdk/lib/_internal/wasm/lib/string_patch.dart

@@ -125,12 +125,18 @@ abstract class _StringBase implements String {
   static String createFromCharCodes(
       Iterable<int> charCodes, int start, int? end, int? limit) {
     // TODO(srdjan): Also skip copying of wide typed arrays.
-    if (charCodes is Uint8List) {
-      final actualEnd =
-          RangeError.checkValidRange(start, end, charCodes.length);
-      return _createOneByteString(charCodes, start, actualEnd - start);
-    } else if (charCodes is! Uint16List) {
-      return _createStringFromIterable(charCodes, start, end);
+    final ccid = ClassID.getID(charCodes);
+    if (ccid != ClassID.cidFixedLengthList &&
+        ccid != ClassID.cidListBase &&
+        ccid != ClassID.cidGrowableList &&
+        ccid != ClassID.cidImmutableList) {
+      if (charCodes is Uint8List) {
+        final actualEnd =
+            RangeError.checkValidRange(start, end, charCodes.length);
+        return _createOneByteString(charCodes, start, actualEnd - start);
+      } else if (charCodes is! Uint16List) {
+        return _createStringFromIterable(charCodes, start, end);
+      }
     }
     final int codeCount = charCodes.length;
     final actualEnd = RangeError.checkValidRange(start, end, codeCount);
@@ -172,11 +178,8 @@ abstract class _StringBase implements String {
     if (charCodes is EfficientLengthIterable) {
       int length = charCodes.length;
       final endVal = RangeError.checkValidRange(start, end, length);
-      final Uint16List charCodeList = Uint16List(endVal - start);
-      int i = 0;
-      for (final char in charCodes.take(endVal).skip(start)) {
-        charCodeList[i++] = char;
-      }
+      final charCodeList =
+          List<int>.from(charCodes.take(endVal).skip(start), growable: false);
       return createFromCharCodes(charCodeList, 0, charCodeList.length, null);
     }
     // Don't know length of iterable, so iterate and see if all the values

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 341
+PRERELEASE 342
 PRERELEASE_PATCH 0