Version 2.15.0-12.0.dev

Merge commit 'eae58445e904440ff3fcb2a12d2905990d66bbf4' into 'dev'

Author: Dart CI

.dart_tool/package_config.json

@@ -11,7 +11,7 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2021-08-10T10:51:47.272341",
+  "generated": "2021-08-12T14:38:50.585343",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
@@ -617,7 +617,7 @@
       "name": "smith",
       "rootUri": "../pkg/smith",
       "packageUri": "lib/",
-      "languageVersion": "2.3"
+      "languageVersion": "2.12"
     },
     {
       "name": "source_map_stack_trace",

pkg/analysis_server/test/lsp/completion_yaml_test.dart

@@ -524,7 +524,7 @@ dependencies:
       openCloseFile: false,
     );
 
-    // Also veryify the detail fields were populated as expected.
+    // Also verify the detail fields were populated as expected.
     expect(
       completionResults.singleWhere((c) => c.label == '^2.3.4').detail,
       equals('latest compatible'),

pkg/dart2js_runtime_metrics/analysis_options.yaml

@@ -1,5 +1,6 @@
 analyzer:
   errors:
     import_internal_library: ignore
+    export_internal_library: ignore
   strong-mode:
     implicit-casts: false

pkg/smith/lib/builder.dart

@@ -21,13 +21,13 @@ class Step {
   final String script;
   final List<String> arguments;
   final Map<String, String> environment;
-  final String fileSet;
-  final int shards;
+  final String? fileSet;
+  final int? shards;
   final bool isTestRunner;
-  final Configuration testedConfiguration;
+  final Configuration? testedConfiguration;
 
-  Step(this.name, String script, this.arguments, this.environment, this.fileSet,
-      this.shards, this.isTestRunner, this.testedConfiguration)
+  Step(this.name, String? script, this.arguments, this.environment,
+      this.fileSet, this.shards, this.isTestRunner, this.testedConfiguration)
       : script = script ?? testScriptName;
 
   static const testScriptName = "tools/test.py";
@@ -36,14 +36,14 @@ class Step {
 
   /// Create a [Step] from the 'step template' [map], values for supported
   /// variables [configuration], and the list of supported named configurations.
-  static Step parse(Map map, Map<String, String> configuration,
+  static Step parse(Map map, Map<String, String?> configuration,
       List<Configuration> configurations) {
-    var arguments = (map["arguments"] as List ?? [])
+    var arguments = (map["arguments"] as List? ?? [])
         .map((argument) => _expandVariables(argument as String, configuration))
         .toList();
     var testedConfigurations = <Configuration>[];
-    var script = map["script"] as String ?? testScriptName;
-    var isTestRunner = map["testRunner"] as bool ?? false;
+    var script = map["script"] as String? ?? testScriptName;
+    var isTestRunner = map["testRunner"] as bool? ?? false;
     if (script == testScriptName || isTestRunner) {
       // TODO(karlklose): replace with argument parser that can handle all
       // arguments to test.py.
@@ -78,8 +78,8 @@ class Step {
         script,
         arguments,
         <String, String>{...?map["environment"]},
-        map["fileset"] as String,
-        map["shards"] as int,
+        map["fileset"] as String?,
+        map["shards"] as int?,
         isTestRunner,
         testedConfigurations.isEmpty ? null : testedConfigurations.single);
   }
@@ -92,13 +92,13 @@ class Step {
 /// the test matrix.
 class Builder {
   final String name;
-  final String description;
+  final String? description;
   final List<Step> steps;
-  final System system;
-  final Mode mode;
-  final Architecture arch;
-  final Sanitizer sanitizer;
-  final Runtime runtime;
+  final System? system;
+  final Mode? mode;
+  final Architecture? arch;
+  final Sanitizer? sanitizer;
+  final Runtime? runtime;
   final Set<Configuration> testedConfigurations;
 
   Builder(this.name, this.description, this.steps, this.system, this.mode,
@@ -111,7 +111,7 @@ class Builder {
   /// `${arch}`, and `${runtime}. The values for these variables are inferred
   /// from the builder's name.
   static Builder parse(String builderName, List<Map> steps,
-      List<Configuration> configurations, String description) {
+      List<Configuration> configurations, String? description) {
     var builderParts = builderName.split("-");
     var systemName = _findPart(builderParts, System.names, 'linux');
     var modeName = _findPart(builderParts, Mode.names, 'release');
@@ -146,7 +146,7 @@ class Builder {
 
 /// Tries to replace a variable named [variableName] with [value] and throws
 /// and exception if the variable is used but `value == null`.
-String _tryReplace(String string, String variableName, String value) {
+String _tryReplace(String string, String variableName, String? value) {
   var variable = "\${$variableName}";
   if (string.contains(variable)) {
     if (value == null) {
@@ -160,7 +160,7 @@ String _tryReplace(String string, String variableName, String value) {
 
 /// Replace the use of supported variable names with the their value given
 /// in [values] and throws an exception if an unsupported variable name is used.
-String _expandVariables(String string, Map<String, String> values) {
+String _expandVariables(String string, Map<String, String?> values) {
   for (var variable in ["system", "mode", "arch", "sanitizer", "runtime"]) {
     string = _tryReplace(string, variable, values[variable]);
   }
@@ -171,33 +171,35 @@ Set<Configuration> _getTestedConfigurations(List<Step> steps) {
   return steps
       .where((step) => step.isTestStep)
       .map((step) => step.testedConfiguration)
+      .whereType<Configuration>()
       .toSet();
 }
 
-T _findIfNotNull<T>(T Function(String) find, String name) {
+T? _findIfNotNull<T>(T Function(String) find, String? name) {
   return name != null ? find(name) : null;
 }
 
-String _findPart(List<String> builderParts, List<String> parts,
-    [String fallback]) {
-  return builderParts.firstWhere((part) => parts.contains(part),
-      orElse: () => fallback);
+String? _findPart(List<String> builderParts, List<String> parts,
+    [String? fallback]) {
+  return builderParts
+      .cast<String?>()
+      .firstWhere((part) => parts.contains(part), orElse: () => fallback);
 }
 
 List<Builder> parseBuilders(
     List<Map> builderConfigurations, List<Configuration> configurations) {
   var builders = <Builder>[];
   var names = <String>{};
   for (var builderConfiguration in builderConfigurations) {
-    var meta = builderConfiguration["meta"] as Map ?? <String, String>{};
+    var meta = builderConfiguration["meta"] as Map? ?? <String, String>{};
     var builderNames = <String>[...?builderConfiguration["builders"]];
     var steps = <Map>[...?builderConfiguration["steps"]];
     for (var builderName in builderNames) {
       if (!names.add(builderName)) {
         throw FormatException('Duplicate builder name: "$builderName"');
       }
       builders.add(Builder.parse(
-          builderName, steps, configurations, meta["description"] as String));
+          builderName, steps, configurations, meta["description"] as String?));
     }
   }
   return builders;

pkg/smith/lib/configuration.dart

@@ -117,10 +117,10 @@ class Configuration {
     var words = name.split("-").toSet();
     var optionsCopy = Map.of(optionsJson);
 
-    T enumOption<T extends NamedEnum>(
+    T? enumOption<T extends NamedEnum>(
         String option, List<String> allowed, T Function(String) parse) {
       // Look up the value from the words in the name.
-      T fromName;
+      T? fromName;
       for (var value in allowed) {
         // Don't treat "none" as matchable since it's ambiguous as to whether
         // it refers to compiler or runtime.
@@ -137,7 +137,7 @@ class Configuration {
       }
 
       // Look up the value from the options.
-      T fromOption;
+      T? fromOption;
       if (optionsCopy.containsKey(option)) {
         fromOption = parse(optionsCopy[option] as String);
         optionsCopy.remove(option);
@@ -157,7 +157,7 @@ class Configuration {
       return fromName ?? fromOption;
     }
 
-    bool boolOption(String option) {
+    bool? boolOption(String option) {
       if (!optionsCopy.containsKey(option)) return null;
 
       var value = optionsCopy.remove(option);
@@ -166,10 +166,10 @@ class Configuration {
         throw FormatException('Option "$option" had value "$value", which is '
             'not a bool.');
       }
-      return value as bool;
+      return value;
     }
 
-    int intOption(String option) {
+    int? intOption(String option) {
       if (!optionsCopy.containsKey(option)) return null;
 
       var value = optionsCopy.remove(option);
@@ -178,10 +178,10 @@ class Configuration {
         throw FormatException('Option "$option" had value "$value", which is '
             'not an int.');
       }
-      return value as int;
+      return value;
     }
 
-    String stringOption(String option) {
+    String? stringOption(String option) {
       if (!optionsCopy.containsKey(option)) return null;
 
       var value = optionsCopy.remove(option);
@@ -190,10 +190,10 @@ class Configuration {
         throw FormatException('Option "$option" had value "$value", which is '
             'not a string.');
       }
-      return value as String;
+      return value;
     }
 
-    List<String> stringListOption(String option) {
+    List<String>? stringListOption(String option) {
       if (!optionsCopy.containsKey(option)) return null;
 
       var value = optionsCopy.remove(option);
@@ -202,7 +202,7 @@ class Configuration {
         throw FormatException('Option "$option" had value "$value", which is '
             'not a List.');
       }
-      return List<String>.from(value as List);
+      return List<String>.from(value);
     }
 
     // Extract options from the name and map.
@@ -340,27 +340,27 @@ class Configuration {
 
   Configuration(this.name, this.architecture, this.compiler, this.mode,
       this.runtime, this.system,
-      {NnbdMode nnbdMode,
-      Sanitizer sanitizer,
-      String babel,
-      String builderTag,
-      List<String> genKernelOptions,
-      List<String> vmOptions,
-      List<String> dart2jsOptions,
-      List<String> experiments,
-      int timeout,
-      bool enableAsserts,
-      bool isChecked,
-      bool isCsp,
-      bool isHostChecked,
-      bool isMinified,
-      bool useAnalyzerCfe,
-      bool useAnalyzerFastaParser,
-      bool useElf,
-      bool useHotReload,
-      bool useHotReloadRollback,
-      bool useSdk,
-      bool useQemu})
+      {NnbdMode? nnbdMode,
+      Sanitizer? sanitizer,
+      String? babel,
+      String? builderTag,
+      List<String>? genKernelOptions,
+      List<String>? vmOptions,
+      List<String>? dart2jsOptions,
+      List<String>? experiments,
+      int? timeout,
+      bool? enableAsserts,
+      bool? isChecked,
+      bool? isCsp,
+      bool? isHostChecked,
+      bool? isMinified,
+      bool? useAnalyzerCfe,
+      bool? useAnalyzerFastaParser,
+      bool? useElf,
+      bool? useHotReload,
+      bool? useHotReloadRollback,
+      bool? useSdk,
+      bool? useQemu})
       : nnbdMode = nnbdMode ?? NnbdMode.legacy,
         sanitizer = sanitizer ?? Sanitizer.none,
         babel = babel ?? "",

pkg/smith/lib/test_matrix.dart

@@ -22,7 +22,7 @@ class TestMatrix {
 
   static TestMatrix fromJson(Map<String, dynamic> json) {
     var configurationsJson =
-        json["configurations"] as Map<String, dynamic> ?? <String, dynamic>{};
+        json["configurations"] as Map<String, dynamic>? ?? <String, dynamic>{};
 
     // Keep track of the configurations and which templates they were expanded
     // from.
@@ -60,8 +60,8 @@ class TestMatrix {
     var testedOn = <Configuration, Builder>{};
     for (var builder in builders) {
       for (var configuration in builder.testedConfigurations) {
-        if (testedOn.containsKey(configuration)) {
-          var other = testedOn[configuration];
+        var other = testedOn[configuration];
+        if (other != null) {
           throw FormatException('Configuration "${configuration.name}" is '
               'tested on both "${builder.name}" and "${other.name}"');
         } else {

pkg/smith/pubspec.yaml

@@ -3,7 +3,7 @@ description: Shared code for working with the Dart SDK's tests and test runner.
 # This package is not intended for consumption on pub.dev. DO NOT publish.
 publish_to: none
 environment:
-  sdk: "^2.3.0"
+  sdk: "^2.12.0"
 dev_dependencies:
   expect:
     path: ../expect

pkg/smith/test/builder_test.dart

@@ -29,7 +29,7 @@ void main() {
         "arguments": ["-nfoo-x64-none-debug-d8-linux"]
       }, {}, configurations);
       expect(step.isTestStep, isTrue);
-      expect(step.testedConfiguration.name, "foo-x64-none-debug-d8-linux");
+      expect(step.testedConfiguration?.name, "foo-x64-none-debug-d8-linux");
     });
     test("custom test runner step", () {
       var step = Step.parse({
@@ -39,15 +39,15 @@ void main() {
         "arguments": ["-nfoo-x64-none-debug-d8-linux"]
       }, {}, configurations);
       expect(step.isTestStep, isTrue);
-      expect(step.testedConfiguration.name, "foo-x64-none-debug-d8-linux");
+      expect(step.testedConfiguration?.name, "foo-x64-none-debug-d8-linux");
     });
     test("implicit test step", () {
       var step = Step.parse({
         "name": "foo",
         "arguments": ["-nfoo-x64-none-debug-d8-linux"]
       }, {}, configurations);
       expect(step.isTestStep, isTrue);
-      expect(step.testedConfiguration.name, "foo-x64-none-debug-d8-linux");
+      expect(step.testedConfiguration?.name, "foo-x64-none-debug-d8-linux");
     });
     test("a step can only test one configuration", () {
       expectFormatError(
@@ -69,7 +69,7 @@ void main() {
         "arguments": ["--named_configuration foo-x64-none-debug-d8-linux"]
       }, {}, configurations);
       expect(step.isTestStep, isTrue);
-      expect(step.testedConfiguration.name, "foo-x64-none-debug-d8-linux");
+      expect(step.testedConfiguration?.name, "foo-x64-none-debug-d8-linux");
     });
     test("a test step using multiple values for the argument", () {
       expectFormatError(
@@ -89,7 +89,7 @@ void main() {
         "arguments": ["-nfoo-x64-none-debug-d8-linux", "--bar", "-b=az"]
       }, {}, configurations);
       expect(step.isTestStep, isTrue);
-      expect(step.testedConfiguration.name, "foo-x64-none-debug-d8-linux");
+      expect(step.testedConfiguration?.name, "foo-x64-none-debug-d8-linux");
     });
     test("in non-test steps, argument -n can have arbitrary values", () {
       var step = Step.parse({
@@ -229,6 +229,6 @@ void expectTestedConfigurations(
     var step = builder.steps[0];
     expect(step.isTestStep, isTrue);
   }
-  expect(builders.map((b) => b.steps[0].testedConfiguration.name).toList(),
+  expect(builders.map((b) => b.steps[0].testedConfiguration!.name).toList(),
       equals(expectedConfigurations));
 }

runtime/bin/eventhandler.h

@@ -32,6 +32,7 @@ enum MessageFlags {
   kSetEventMaskCommand = 12,
   kListeningSocket = 16,
   kPipe = 17,
+  kSignalSocket = 18,
 };
 
 // clang-format off
@@ -54,6 +55,8 @@ enum MessageFlags {
      (data & ~(1 << kInEvent | 1 << kOutEvent | 1 << kCloseEvent)) == 0)
 #define IS_LISTENING_SOCKET(data)                                              \
     ((data & (1 << kListeningSocket)) != 0)  // NOLINT
+#define IS_SIGNAL_SOCKET(data)                                                 \
+    ((data & (1 << kSignalSocket)) != 0)  // NOLINT
 #define TOKEN_COUNT(data) (data & ((1 << kCloseCommand) - 1))
 // clang-format on