Version 2.14.0-96.0.dev

Merge commit '90127334ea4aab5267135b959e361229dfac6bc9' into 'dev'

Author: Dart CI

DEPS

@@ -146,10 +146,10 @@ vars = {
   "resource_rev": "6b79867d0becf5395e5819a75720963b8298e9a7",
   "root_certificates_rev": "7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8",
   "rust_revision": "b7856f695d65a8ebc846754f97d15814bcb1c244",
-  "shelf_static_rev": "fa30419055279a00c9e428439b1abe362d18f25d",
+  "shelf_static_rev": "b8e51372332a27a4939466d94a22f15be53ac3e4",
   "shelf_packages_handler_rev": "78302e67c035047e6348e692b0c1182131f0fe35",
   "shelf_proxy_tag": "v1.0.0",
-  "shelf_rev": "4b9294e29eb308709444a5c0b890fa8ccd69fae4",
+  "shelf_rev": "c511f06e6d2d28ffe905a45eea1da761b95ea0ca",
   "shelf_web_socket_rev": "24fb8a04befa75a94ac63a27047b231d1a22aab4",
   "source_map_stack_trace_rev": "1c3026f69d9771acf2f8c176a1ab750463309cce",
   "source_maps-0.9.4_rev": "38524",

pkg/compiler/lib/src/ssa/builder_kernel.dart

@@ -6130,7 +6130,6 @@ class KernelSsaGraphBuilder extends ir.Visitor<void> with ir.VisitorVoidMixin {
     }
 
     ir.Member memberContextNode = _elementMap.getMemberContextNode(function);
-    bool hasBox = false;
     KernelToLocalsMap localsMap = _globalLocalsMap.getLocalsMap(function);
     forEachOrderedParameter(_elementMap, function,
         (ir.VariableDeclaration variable, {bool isElided}) {
@@ -6144,14 +6143,13 @@ class KernelSsaGraphBuilder extends ir.Visitor<void> with ir.VisitorVoidMixin {
           scopeData.isBoxedVariable(_localsMap, local)) {
         // The parameter will be a field in the box passed as the last
         // parameter. So no need to have it.
-        hasBox = true;
         return;
       }
       HInstruction argument = compiledArguments[argumentIndex++];
       localsHandler.updateLocal(local, argument);
     });
 
-    if (hasBox) {
+    if (forGenerativeConstructorBody && scopeData.requiresContextBox) {
       HInstruction box = compiledArguments[argumentIndex++];
       assert(box is HCreateBox);
       // TODO(sra): Make inlining of closures work. We should always call

pkg/compiler/test/analyses/api_allowed.json

@@ -1,76 +1,14 @@
 {
   "org-dartlang-sdk:///lib/_internal/js_runtime/lib/js_number.dart": {
-    "Dynamic invocation of '[]'.": 5,
-    "Dynamic invocation of '<'.": 4,
-    "Dynamic invocation of '>='.": 1,
-    "Dynamic invocation of '<='.": 1,
-    "Dynamic invocation of '>'.": 2
+    "Dynamic invocation of '[]'.": 5
   },
   "org-dartlang-sdk:///lib/_internal/js_runtime/lib/js_helper.dart": {
-    "Dynamic invocation of '[]'.": 3,
-    "Dynamic access of 'isNaN'.": 3,
-    "Dynamic invocation of '<='.": 2,
-    "Dynamic invocation of '-'.": 3,
-    "Dynamic invocation of '&'.": 1,
-    "Dynamic invocation of '>>'.": 1,
-    "Dynamic invocation of '<'.": 2,
-    "Dynamic invocation of '+'.": 1,
-    "Dynamic invocation of '>'.": 1,
     "Dynamic access of 'length'.": 1
   },
-  "org-dartlang-sdk:///lib/_internal/js_runtime/lib/string_helper.dart": {
-    "Dynamic invocation of '<'.": 1,
-    "Dynamic invocation of '+'.": 1,
-    "Dynamic invocation of '>='.": 1,
-    "Dynamic invocation of 'substring'.": 7,
-    "Dynamic invocation of 'allMatches'.": 3,
-    "Dynamic access of 'isNotEmpty'.": 1,
-    "Dynamic invocation of '_js_helper::_execGlobal'.": 1,
-    "Dynamic access of 'start'.": 1,
-    "Dynamic access of 'end'.": 1,
-    "Dynamic invocation of 'call'.": 13,
-    "Dynamic access of 'length'.": 3,
-    "Dynamic invocation of 'codeUnitAt'.": 2,
-    "Dynamic invocation of '[]'.": 1,
-    "Dynamic access of 'iterator'.": 2,
-    "Dynamic invocation of 'replaceRange'.": 2
-  },
-  "org-dartlang-sdk:///lib/_internal/js_runtime/lib/linked_hash_map.dart": {
-    "Dynamic access of '_js_helper::_length'.": 2,
-    "Dynamic access of '_js_helper::_modifications'.": 4,
-    "Dynamic invocation of 'containsKey'.": 1,
-    "Dynamic access of '_js_helper::_first'.": 2
-  },
-  "org-dartlang-sdk:///lib/_internal/js_runtime/lib/native_helper.dart": {
-    "Dynamic access of 'length'.": 2,
-    "Dynamic invocation of '[]'.": 1
-  },
-  "org-dartlang-sdk:///lib/_internal/js_runtime/lib/regexp_helper.dart": {
-    "Dynamic access of 'length'.": 1,
-    "Dynamic invocation of '-'.": 1
-  },
-  "org-dartlang-sdk:///lib/_internal/js_runtime/lib/native_typed_data.dart": {
-    "Dynamic invocation of '>'.": 1,
-    "Dynamic invocation of '>='.": 1
-  },
   "org-dartlang-sdk:///lib/_internal/js_runtime/lib/async_patch.dart": {
-    "Dynamic invocation of '-'.": 1,
     "Dynamic access of 'iterator'.": 1,
-    "Dynamic invocation of 'call'.": 1,
     "Dynamic invocation of 'then'.": 1
   },
-  "org-dartlang-sdk:///lib/_internal/js_runtime/lib/collection_patch.dart": {
-    "Dynamic access of 'dart.collection::_length'.": 2,
-    "Dynamic invocation of 'dart.collection::_computeKeys'.": 2,
-    "Dynamic invocation of 'containsKey'.": 2,
-    "Dynamic access of 'dart.collection::_keys'.": 2,
-    "Dynamic access of 'length'.": 1,
-    "Dynamic access of 'isEmpty'.": 1,
-    "Dynamic access of 'dart.collection::_modifications'.": 5,
-    "Dynamic access of 'dart.collection::_map'.": 4,
-    "Dynamic access of 'dart.collection::_elements'.": 1,
-    "Dynamic access of 'dart.collection::_first'.": 1
-  },
   "org-dartlang-sdk:///lib/html/dart2js/html_dart2js.dart": {
     "Dynamic access of 'style'.": 1,
     "Dynamic invocation of 'remove'.": 2,

pkg/compiler/test/rti/data/map_literal.dart

@@ -11,7 +11,7 @@
 /*spec.class: global#LinkedHashMap:deps=[Map],direct,explicit=[LinkedHashMap<LinkedHashMap.K,LinkedHashMap.V>],implicit=[LinkedHashMap.K,LinkedHashMap.V],needsArgs*/
 
 /*prod.class: global#JsLinkedHashMap:deps=[LinkedHashMap]*/
-/*spec.class: global#JsLinkedHashMap:deps=[LinkedHashMap],direct,explicit=[JsLinkedHashMap.K,JsLinkedHashMap.V,void Function(JsLinkedHashMap.K,JsLinkedHashMap.V)],implicit=[JsLinkedHashMap.K,JsLinkedHashMap.V],needsArgs*/
+/*spec.class: global#JsLinkedHashMap:deps=[LinkedHashMap],direct,explicit=[JsLinkedHashMap,JsLinkedHashMap.K,JsLinkedHashMap.V,void Function(JsLinkedHashMap.K,JsLinkedHashMap.V)],implicit=[JsLinkedHashMap.K,JsLinkedHashMap.V],needsArgs*/
 
 /*prod.class: global#double:*/
 /*spec.class: global#double:implicit=[double]*/

pkg/compiler/test/rti/data/map_to_set.dart

@@ -11,7 +11,7 @@
 /*spec.class: global#LinkedHashMap:deps=[Map],direct,explicit=[LinkedHashMap<LinkedHashMap.K,LinkedHashMap.V>],implicit=[LinkedHashMap.K,LinkedHashMap.V],needsArgs*/
 
 /*prod.class: global#JsLinkedHashMap:deps=[LinkedHashMap],implicit=[JsLinkedHashMap.K],needsArgs*/
-/*spec.class: global#JsLinkedHashMap:deps=[LinkedHashMap],direct,explicit=[JsLinkedHashMap.K,JsLinkedHashMap.V,void Function(JsLinkedHashMap.K,JsLinkedHashMap.V)],implicit=[JsLinkedHashMap.K,JsLinkedHashMap.V],needsArgs*/
+/*spec.class: global#JsLinkedHashMap:deps=[LinkedHashMap],direct,explicit=[JsLinkedHashMap,JsLinkedHashMap.K,JsLinkedHashMap.V,void Function(JsLinkedHashMap.K,JsLinkedHashMap.V)],implicit=[JsLinkedHashMap.K,JsLinkedHashMap.V],needsArgs*/
 
 /*prod.class: global#double:*/
 /*spec.class: global#double:implicit=[double]*/

pkg/compiler/test/rti/emission/local_function_map_literal.dart

@@ -6,7 +6,9 @@
 
 import 'package:expect/expect.dart';
 
-/*class: global#JsLinkedHashMap:checks=[],instance*/
+/*spec.class: global#JsLinkedHashMap:checkedInstance,checks=[],instance*/
+
+/*prod.class: global#JsLinkedHashMap:checks=[],instance*/
 
 @pragma('dart2js:noInline')
 method<T>() {

pkg/compiler/test/rti/emission/map_literal.dart

@@ -7,7 +7,8 @@
 /*spec.class: global#Map:instance*/
 
 /*class: global#LinkedHashMap:*/
-/*class: global#JsLinkedHashMap:checks=[],instance*/
+/*spec.class: global#JsLinkedHashMap:checkedInstance,checks=[],instance*/
+/*prod.class: global#JsLinkedHashMap:checks=[],instance*/
 
 /*spec.class: global#double:checkedInstance,instance,typeArgument*/
 

sdk/lib/_internal/js_runtime/lib/async_patch.dart

@@ -41,12 +41,12 @@ class _AsyncRun {
       // Use mutationObservers.
       var div = JS('', 'self.document.createElement("div")');
       var span = JS('', 'self.document.createElement("span")');
-      var storedCallback;
+      void Function()? storedCallback;
 
       internalCallback(_) {
         var f = storedCallback;
         storedCallback = null;
-        f();
+        f!();
       }
 
       var observer = JS('', 'new self.MutationObserver(#)',
@@ -148,7 +148,8 @@ class _TimerImpl implements Timer {
           convertDartClosureToJS(() {
             int tick = this._tick + 1;
             if (milliseconds > 0) {
-              int duration = JS('int', 'Date.now()') - start;
+              int end = JS('int', 'Date.now()');
+              int duration = end - start;
               if (duration > (tick + 1) * milliseconds) {
                 tick = duration ~/ milliseconds;
               }

sdk/lib/_internal/js_runtime/lib/collection_patch.dart

@@ -448,7 +448,7 @@ class _CustomHashMap<K, V> extends _HashMap<K, V> {
 }
 
 class _HashMapKeyIterable<E> extends EfficientLengthIterable<E> {
-  final _map;
+  final _HashMap _map;
   _HashMapKeyIterable(this._map);
 
   int get length => _map._length;
@@ -474,7 +474,7 @@ class _HashMapKeyIterable<E> extends EfficientLengthIterable<E> {
 }
 
 class _HashMapKeyIterator<E> implements Iterator<E> {
-  final _map;
+  final _HashMap _map;
   final List _keys;
   int _offset = 0;
   E? _current;
@@ -682,7 +682,7 @@ class _Es6LinkedIdentityHashMap<K, V> extends _LinkedIdentityHashMap<K, V>
 }
 
 class _Es6MapIterable<E> extends EfficientLengthIterable<E> {
-  final _map;
+  final _Es6LinkedIdentityHashMap _map;
   final bool _isKeys;
 
   _Es6MapIterable(this._map, this._isKeys);
@@ -717,7 +717,7 @@ class _Es6MapIterable<E> extends EfficientLengthIterable<E> {
 }
 
 class _Es6MapIterator<E> implements Iterator<E> {
-  final _map;
+  final _Es6LinkedIdentityHashMap _map;
   final int _modifications;
   final bool _isKeys;
   var _jsIterator;
@@ -1187,7 +1187,7 @@ class _CustomHashSet<E> extends _HashSet<E> {
 
 // TODO(kasperl): Share this code with _HashMapKeyIterator<E>?
 class _HashSetIterator<E> implements Iterator<E> {
-  final _set;
+  final _HashSet<E> _set;
   final List _elements;
   int _offset = 0;
   E? _current;
@@ -1689,7 +1689,7 @@ class _LinkedHashSetCell {
 
 // TODO(kasperl): Share this code with LinkedHashMapKeyIterator<E>?
 class _LinkedHashSetIterator<E> implements Iterator<E> {
-  final _set;
+  final _LinkedHashSet<E> _set;
   final int _modifications;
   _LinkedHashSetCell? _cell;
   E? _current;

sdk/lib/_internal/js_runtime/lib/core_patch.dart

@@ -22,7 +22,6 @@ import 'dart:_js_helper'
         patch,
         Primitives,
         quoteStringForRegExp,
-        stringJoinUnchecked,
         getTraceFromException,
         RuntimeError;