Version 2.17.0-98.0.dev

Merge commit '20401b32ec009344287120d546c381815bdb7a48' into 'dev'

Author: Dart CI

DEPS

@@ -93,7 +93,7 @@ vars = {
   "collection_rev": "a4c941ab94044d118b2086a3f261c30377604127",
   "convert_rev": "e063fdca4bebffecbb5e6aa5525995120982d9ce",
   "crypto_rev": "b5024e4de2b1c474dd558bef593ddbf0bfade152",
-  "csslib_rev": "158bfa94eed08c12c07a8ee0a3fded0ebdcd1fcb",
+  "csslib_rev": "f746368a0a53cf8f68fd71b218239034e88841d5",
 
   # Note: Updates to dart_style have to be coordinated with the infrastructure
   # team so that the internal formatter `tools/sdks/dart-sdk/bin/dart format`
@@ -130,7 +130,7 @@ vars = {
   "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
   "markdown_rev": "7479783f0493f6717e1d7ae31cb37d39a91026b2",
   "matcher_rev": "07595a7739d47a8315caba5a8e58fb9ae3d81261",
-  "mime_rev": "c931f4bed87221beaece356494b43731445ce7b8",
+  "mime_rev": "7f4252d469de032aa4df9f90e827dbac4b8efa48",
   "mockito_rev": "d39ac507483b9891165e422ec98d9fb480037c8b",
   "oauth2_rev": "7cd3284049fe5badbec9f2bea2afc41d14c01057",
   "package_config_rev": "8731bf10b5375542792a32a0f7c8a6f370583d96",

benchmarks/Iterators/dart/Iterators.dart

@@ -331,6 +331,60 @@ class BenchmarkListIntGrowable extends MonoBenchmark {
   }
 }
 
+class BenchmarkListIntSystem1 extends MonoBenchmark {
+  // The List type here is not quite monomorphic. It is the choice between two
+  // 'system' Lists: a const List and a growable List. It is quite common to
+  // have growable and const lists at the same use-site (e.g. the const coming
+  // from a default argument).
+  //
+  // Ideally some combination of the class heirarchy or compiler tricks would
+  // ensure there is little cost of having this gentle polymorphism.
+  BenchmarkListIntSystem1(int size)
+      : _list1 = List.generate(size, (i) => i),
+        _list2 = generateConstListOfInt(size),
+        super('List.int.growable.and.const', size);
+
+  final List<int> _list1;
+  final List<int> _list2;
+  bool _flip = false;
+
+  @override
+  void sinkMono() {
+    _flip = !_flip;
+    final list = _flip ? _list1 : _list2;
+    for (final value in list) {
+      sink = value;
+    }
+  }
+}
+
+class BenchmarkListIntSystem2 extends MonoBenchmark {
+  // The List type here is not quite monomorphic. It is the choice between two
+  // 'system' Lists: a const List and a fixed-length List. It is quite common to
+  // have fixed-length and const lists at the same use-site (e.g. the const
+  // coming from a default argument).
+  //
+  // Ideally some combination of the class heirarchy or compiler tricks would
+  // ensure there is little cost of having this gentle polymorphism.
+  BenchmarkListIntSystem2(int size)
+      : _list1 = List.generate(size, (i) => i, growable: false),
+        _list2 = generateConstListOfInt(size),
+        super('List.int.fixed.and.const', size);
+
+  final List<int> _list1;
+  final List<int> _list2;
+  bool _flip = false;
+
+  @override
+  void sinkMono() {
+    _flip = !_flip;
+    final list = _flip ? _list1 : _list2;
+    for (final value in list) {
+      sink = value;
+    }
+  }
+}
+
 /// A simple Iterable that yields the integers 0 through `length`.
 ///
 /// This Iterable serves as the minimal interesting example to serve as a
@@ -492,6 +546,8 @@ void main(List<String> commandLineArguments) {
       Benchmark('Runes', size, (n) => generateString(n).runes),
       // ---
       BenchmarkListIntGrowable(size),
+      BenchmarkListIntSystem1(size),
+      BenchmarkListIntSystem2(size),
       Benchmark('List.int.growable', size,
           (n) => List<int>.of(UpTo(n), growable: true)),
       Benchmark('List.int.fixed', size,

benchmarks/Iterators/dart/data.dart

@@ -12,6 +12,11 @@ Set<int> generateConstSetOfInt(int n) {
       (throw ArgumentError.value(n, 'n', 'size not supported'));
 }
 
+List<int> generateConstListOfInt(int n) {
+  return constListOfIntTable[n] ??
+      (throw ArgumentError.value(n, 'n', 'size not supported'));
+}
+
 const Map<int, Map<int, int>> constMapIntIntTable = {
   0: constMapIntInt0,
   1: constMapIntInt1,
@@ -136,104 +141,37 @@ const Set<int> constSetOfInt0 = {};
 const Set<int> constSetOfInt1 = {0};
 const Set<int> constSetOfInt2 = {0, 1};
 const Set<int> constSetOfInt100 = {
-  0,
-  1,
-  2,
-  3,
-  4,
-  5,
-  6,
-  7,
-  8,
-  9,
-  10,
-  11,
-  12,
-  13,
-  14,
-  15,
-  16,
-  17,
-  18,
-  19,
-  20,
-  21,
-  22,
-  23,
-  24,
-  25,
-  26,
-  27,
-  28,
-  29,
-  30,
-  31,
-  32,
-  33,
-  34,
-  35,
-  36,
-  37,
-  38,
-  39,
-  40,
-  41,
-  42,
-  43,
-  44,
-  45,
-  46,
-  47,
-  48,
-  49,
-  50,
-  51,
-  52,
-  53,
-  54,
-  55,
-  56,
-  57,
-  58,
-  59,
-  60,
-  61,
-  62,
-  63,
-  64,
-  65,
-  66,
-  67,
-  68,
-  69,
-  70,
-  71,
-  72,
-  73,
-  74,
-  75,
-  76,
-  77,
-  78,
-  79,
-  80,
-  81,
-  82,
-  83,
-  84,
-  85,
-  86,
-  87,
-  88,
-  89,
-  90,
-  91,
-  92,
-  93,
-  94,
-  95,
-  96,
-  97,
-  98,
-  99
+  ...{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+  ...{10, 11, 12, 13, 14, 15, 16, 17, 18, 19},
+  ...{20, 21, 22, 23, 24, 25, 26, 27, 28, 29},
+  ...{30, 31, 32, 33, 34, 35, 36, 37, 38, 39},
+  ...{40, 41, 42, 43, 44, 45, 46, 47, 48, 49},
+  ...{50, 51, 52, 53, 54, 55, 56, 57, 58, 59},
+  ...{60, 61, 62, 63, 64, 65, 66, 67, 68, 69},
+  ...{70, 71, 72, 73, 74, 75, 76, 77, 78, 79},
+  ...{80, 81, 82, 83, 84, 85, 86, 87, 88, 89},
+  ...{90, 91, 92, 93, 94, 95, 96, 97, 98, 99}
 };
+
+const Map<int, List<int>> constListOfIntTable = {
+  0: constListOfInt0,
+  1: constListOfInt1,
+  2: constListOfInt2,
+  100: constListOfInt100
+};
+
+const List<int> constListOfInt0 = [];
+const List<int> constListOfInt1 = [0];
+const List<int> constListOfInt2 = [0, 1];
+const List<int> constListOfInt100 = [
+  ...[0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+  ...[10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+  ...[20, 21, 22, 23, 24, 25, 26, 27, 28, 29],
+  ...[30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
+  ...[40, 41, 42, 43, 44, 45, 46, 47, 48, 49],
+  ...[50, 51, 52, 53, 54, 55, 56, 57, 58, 59],
+  ...[60, 61, 62, 63, 64, 65, 66, 67, 68, 69],
+  ...[70, 71, 72, 73, 74, 75, 76, 77, 78, 79],
+  ...[80, 81, 82, 83, 84, 85, 86, 87, 88, 89],
+  ...[90, 91, 92, 93, 94, 95, 96, 97, 98, 99]
+];

pkg/_fe_analyzer_shared/analysis_options_no_lints.yaml

@@ -19,3 +19,4 @@ analyzer:
     - test/inference/inferred_type_arguments/data/**
     - test/inference/inferred_variable_types/data/**
     - test/inheritance/data/**
+    - test/macros/api/**

pkg/_fe_analyzer_shared/test/macros/api/api_test_data.dart

@@ -0,0 +1,19 @@
+// Copyright (c) 2022, 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.
+
+import 'api_test_macro.dart';
+
+main() {}
+
+@ClassMacro()
+class Class1 {}
+
+@ClassMacro()
+abstract class Class2 {}
+
+@FunctionMacro()
+void topLevelFunction1(Class1 a, {Class1? b, required Class2? c}) {}
+
+@FunctionMacro()
+external Class2 topLevelFunction2(Class1 a, [Class2? b]);