Version 2.19.0-397.0.dev

Merge 5ea3ef2 into dev

Author: Dart CI

pkg/dart2wasm/lib/dispatch_table.dart

@@ -22,7 +22,6 @@ class SelectorInfo {
 
   final int id;
   final int callCount;
-  final bool tornOff;
   final ParameterInfo paramInfo;
   int returnCount;
 
@@ -45,8 +44,8 @@ class SelectorInfo {
 
   int get sortWeight => classIds.length * 10 + callCount;
 
-  SelectorInfo(this.translator, this.id, this.callCount, this.tornOff,
-      this.paramInfo, this.returnCount);
+  SelectorInfo(this.translator, this.id, this.callCount, this.paramInfo,
+      this.returnCount);
 
   /// Compute the signature for the functions implementing members targeted by
   /// this selector.
@@ -222,6 +221,16 @@ class DispatchTable {
                 .mapping;
 
   SelectorInfo selectorForTarget(Reference target) {
+    Member member = target.asMember;
+    bool isGetter = target.isGetter || target.isTearOffReference;
+    ProcedureAttributesMetadata metadata = procedureAttributeMetadata[member]!;
+    int selectorId = isGetter
+        ? metadata.getterSelectorId
+        : metadata.methodOrSetterSelectorId;
+    return selectorInfo[selectorId]!;
+  }
+
+  SelectorInfo _createSelectorForTarget(Reference target) {
     Member member = target.asMember;
     bool isGetter = target.isGetter || target.isTearOffReference;
     bool isSetter = target.isSetter;
@@ -244,13 +253,8 @@ class DispatchTable {
 
     final selector = selectorInfo.putIfAbsent(
         selectorId,
-        () => SelectorInfo(
-            translator,
-            selectorId,
-            selectorMetadata[selectorId].callCount,
-            selectorMetadata[selectorId].tornOff,
-            paramInfo,
-            returnCount));
+        () => SelectorInfo(translator, selectorId,
+            selectorMetadata[selectorId].callCount, paramInfo, returnCount));
     selector.paramInfo.merge(paramInfo);
     selector.returnCount = max(selector.returnCount, returnCount);
     selector.calledDynamically |= calledDynamically;
@@ -301,7 +305,7 @@ class DispatchTable {
       }
 
       SelectorInfo addMember(Reference reference) {
-        SelectorInfo selector = selectorForTarget(reference);
+        SelectorInfo selector = _createSelectorForTarget(reference);
         if (reference.asMember.isAbstract) {
           selector.targets[info.classId] ??= reference;
         } else {
@@ -319,7 +323,7 @@ class DispatchTable {
             if (member.hasSetter) addMember(member.setterReference!);
           } else if (member is Procedure) {
             SelectorInfo method = addMember(member.reference);
-            if (method.tornOff &&
+            if (selectorMetadata[method.id].tornOff &&
                 procedureAttributeMetadata[member]!.hasTearOffUses) {
               addMember(member.tearOffReference);
             }

runtime/include/dart_api.h

@@ -1105,7 +1105,7 @@ Dart_CreateIsolateGroup(const char* script_uri,
  *   shutdown (may be NULL).
  * \param cleanup_callback A callback to be called when the isolate is being
  *   cleaned up (may be NULL).
- * \param isolate_data The embedder-specific data associated with this isolate.
+ * \param child_isolate_data The embedder-specific data associated with this isolate.
  * \param error Set to NULL if creation is successful, set to an error
  *   message otherwise. The caller is responsible for calling free() on the
  *   error message.

runtime/observatory/lib/src/elements/heap_snapshot.dart

@@ -603,7 +603,6 @@ class HeapSnapshotElement extends CustomElement implements Renderable {
     var blob = new Blob(_snapshotA!.chunks, 'application/octet-stream');
     var blobUrl = Url.createObjectUrl(blob);
     var link = new AnchorElement();
-    // ignore: unsafe_html
     link.href = blobUrl;
     var now = new DateTime.now();
     link.download = 'dart-heap-${now.year}-${now.month}-${now.day}.bin';

runtime/observatory/lib/src/elements/process_snapshot.dart

@@ -298,7 +298,6 @@ class ProcessSnapshotElement extends CustomElement implements Renderable {
     var blob = new Blob([jsonEncode(_snapshotA)], 'application/json');
     var blobUrl = Url.createObjectUrl(blob);
     var link = new AnchorElement();
-    // ignore: unsafe_html
     link.href = blobUrl;
     var now = new DateTime.now();
     link.download = 'dart-process-${now.year}-${now.month}-${now.day}.json';

runtime/observatory/lib/src/elements/timeline_page.dart

@@ -185,7 +185,6 @@ class TimelinePageElement extends CustomElement implements Renderable {
                 "This VM is forwarding timeline events to Fuchsia's system tracing. See the ",
           new AnchorElement()
             ..text = "Fuchsia Tracing Usage Guide"
-            // ignore: unsafe_html
             ..href = "https://fuchsia.dev/fuchsia-src/development/tracing",
           new SpanElement()..text = ".",
         ];
@@ -201,7 +200,6 @@ class TimelinePageElement extends CustomElement implements Renderable {
                 "This VM is forwarding timeline events to Android's systrace. See the ",
           new AnchorElement()
             ..text = "systrace usage guide"
-            // ignore: unsafe_html
             ..href =
                 "https://developer.android.com/studio/command-line/systrace",
           new SpanElement()..text = ".",
@@ -219,7 +217,6 @@ class TimelinePageElement extends CustomElement implements Renderable {
                     "To track these events, open 'Instruments' and add the 'os_signpost' Filter. See the ",
           new AnchorElement()
             ..text = "Instruments Usage Guide"
-            // ignore: unsafe_html
             ..href = "https://help.apple.com/instruments",
           new SpanElement()..text = ".",
         ];

runtime/observatory_2/lib/src/elements/heap_snapshot.dart

@@ -642,7 +642,6 @@ class HeapSnapshotElement extends CustomElement implements Renderable {
     var blob = new Blob(_snapshotA.chunks, 'application/octet-stream');
     var blobUrl = Url.createObjectUrl(blob);
     var link = new AnchorElement();
-    // ignore: unsafe_html
     link.href = blobUrl;
     var now = new DateTime.now();
     link.download = 'dart-heap-${now.year}-${now.month}-${now.day}.bin';

runtime/observatory_2/lib/src/elements/process_snapshot.dart

@@ -134,7 +134,6 @@ class ProcessSnapshotElement extends CustomElement implements Renderable {
     var blob = new Blob([jsonEncode(_snapshotA)], 'application/json');
     var blobUrl = Url.createObjectUrl(blob);
     var link = new AnchorElement();
-    // ignore: unsafe_html
     link.href = blobUrl;
     var now = new DateTime.now();
     link.download = 'dart-process-${now.year}-${now.month}-${now.day}.json';

runtime/observatory_2/lib/src/elements/timeline/dashboard.dart

@@ -91,7 +91,6 @@ class TimelineDashboardElement extends CustomElement implements Renderable {
     if (_content == null) {
       _content = new DivElement()..classes = ['content-centered-big'];
     }
-    // ignore: unsafe_html
     _frame.src = _makeFrameUrl();
     _content.children = <Element>[
       new HeadingElement.h2()

runtime/observatory_2/lib/src/elements/timeline_page.dart

@@ -184,7 +184,6 @@ class TimelinePageElement extends CustomElement implements Renderable {
                 "This VM is forwarding timeline events to Fuchsia's system tracing. See the ",
           new AnchorElement()
             ..text = "Fuchsia Tracing Usage Guide"
-            // ignore: unsafe_html
             ..href = "https://fuchsia.dev/fuchsia-src/development/tracing",
           new SpanElement()..text = ".",
         ];
@@ -200,7 +199,6 @@ class TimelinePageElement extends CustomElement implements Renderable {
                 "This VM is forwarding timeline events to Android's systrace. See the ",
           new AnchorElement()
             ..text = "systrace usage guide"
-            // ignore: unsafe_html
             ..href =
                 "https://developer.android.com/studio/command-line/systrace",
           new SpanElement()..text = ".",
@@ -218,7 +216,6 @@ class TimelinePageElement extends CustomElement implements Renderable {
                     "To track these events, open 'Instruments' and add the 'os_signpost' Filter. See the ",
           new AnchorElement()
             ..text = "Instruments Usage Guide"
-            // ignore: unsafe_html
             ..href = "https://help.apple.com/instruments",
           new SpanElement()..text = ".",
         ];

tools/VERSION

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