Version 3.9.0-228.0.dev

Merge 4b3c8a3 into dev

Author: Dart CI

pkg/analysis_server/test/support/sdk_paths.dart

@@ -45,7 +45,9 @@ String get sdkRootPath {
 /// When running from source, the server will be compiled to disk for the first
 /// request to speed up subsequent tests in the same process.
 Future<String> getAnalysisServerPath(String dartSdkPath) async {
-  var dartBinary = path.join(dartSdkPath, 'bin', 'dart');
+  // Always use the "real" SDK binary for compilation, not the path provided,
+  // which might be an incomplete SDK that is the target of the test.
+  var dartBinary = Platform.resolvedExecutable;
   var snapshotPath = path.join(
     dartSdkPath,
     'bin',

pkg/compiler/lib/src/js_model/js_world.dart

@@ -542,10 +542,6 @@ class JClosedWorld implements World {
     return false;
   }
 
-  late final ClassEntity _functionLub = getLubOfInstantiatedSubtypes(
-    commonElements.functionClass,
-  )!;
-
   /// Returns `true` if [selector] on [receiver] can hit a `call` method on a
   /// subclass of `Closure` using the [abstractValueDomain].
   ///
@@ -559,23 +555,9 @@ class JClosedWorld implements World {
   ) {
     return selector.name == Identifiers.call &&
         (receiver == null ||
-            // This is logically equivalent to the former implementation using
-            // `abstractValueDomain.contains` (which wrapped `containsMask`).
-            // The switch to `abstractValueDomain.containsType` is because
-            // `contains` was generally unsound but happened to work correctly
-            // here. See https://dart-review.googlesource.com/c/sdk/+/130565
-            // for further discussion.
-            //
-            // This checks if the receiver mask contains the entire type cone
-            // originating from [_functionLub] and may therefore be unsound if
-            // the receiver mask contains only part of the type cone. (Is this
-            // possible?)
-            //
-            // TODO(fishythefish): Use `isDisjoint` or equivalent instead of
-            // `containsType` once we can ensure it's fast enough.
             abstractValueDomain
-                .containsType(receiver, _functionLub)
-                .isPotentiallyTrue);
+                .areDisjoint(abstractValueDomain.functionType, receiver)
+                .isPotentiallyFalse);
   }
 
   /// Returns `true` if [selector] on [receiver] can hit a `call` method on a
@@ -591,9 +573,9 @@ class JClosedWorld implements World {
   Selector getSelector(ir.Expression node) => elementMap.getSelector(node);
 
   /// Returns all the instance members that may be invoked with the [selector]
-  /// on the given [receiver] using the [abstractValueDomain]. The returned elements may include noSuchMethod
-  /// handlers that are potential targets indirectly through the noSuchMethod
-  /// mechanism.
+  /// on the given [receiver] using the [abstractValueDomain]. The returned
+  /// elements may include noSuchMethod handlers that are potential targets
+  /// indirectly through the noSuchMethod mechanism.
   Iterable<MemberEntity> locateMembersInDomain(
     Selector selector,
     AbstractValue? receiver,

pkg/dartdev/lib/src/commands/compile.dart

@@ -360,6 +360,11 @@ class CompileJitSnapshotCommand extends CompileSubcommandCommand {
         abbr: defineOption.abbr,
         valueHelp: defineOption.valueHelp,
       )
+      ..addFlag(
+        enableAssertsOption.flag,
+        negatable: false,
+        help: enableAssertsOption.help,
+      )
       ..addFlag(soundNullSafetyOption.flag,
           help: soundNullSafetyOption.help,
           defaultsTo: soundNullSafetyOption.flagDefaultsTo,
@@ -409,6 +414,7 @@ class CompileJitSnapshotCommand extends CompileSubcommandCommand {
 
     final enabledExperiments = args.enabledExperiments;
     final defines = args.multiOption(defineOption.flag);
+    final enableAsserts = args.flag(enableAssertsOption.flag);
 
     // Build arguments.
     final buildArgs = <String>[];
@@ -439,6 +445,11 @@ class CompileJitSnapshotCommand extends CompileSubcommandCommand {
     for (final define in defines) {
       buildArgs.add('-D$define');
     }
+
+    if (enableAsserts) {
+      buildArgs.add('--${enableAssertsOption.flag}');
+    }
+
     buildArgs.add(path.canonicalize(sourcePath));
 
     // Add the training arguments.
@@ -493,9 +504,9 @@ class CompileNativeCommand extends CompileSubcommandCommand {
         valueHelp: defineOption.valueHelp,
       )
       ..addFlag(
-        'enable-asserts',
+        enableAssertsOption.flag,
         negatable: false,
-        help: 'Enable assert statements.',
+        help: enableAssertsOption.help,
       )
       ..addOption(
         packagesOption.flag,
@@ -663,7 +674,7 @@ Remove debugging information from the output and save it separately to the speci
         defines: args.multiOption(defineOption.flag),
         packages: args.option('packages'),
         enableExperiment: args.enabledExperiments.join(','),
-        enableAsserts: args.flag('enable-asserts'),
+        enableAsserts: args.flag(enableAssertsOption.flag),
         debugFile: args.option('save-debugging-info'),
         verbose: verbose,
         verbosity: args.option('verbosity')!,
@@ -821,9 +832,9 @@ class CompileWasmCommand extends CompileSubcommandCommand {
         negatable: false,
       )
       ..addFlag(
-        'enable-asserts',
-        help: 'Enable assert statements.',
+        enableAssertsOption.flag,
         negatable: false,
+        help: enableAssertsOption.help,
       )
       ..addOption(
         'shared-memory',
@@ -977,7 +988,7 @@ class CompileWasmCommand extends CompileSubcommandCommand {
       if (packages != null) '--packages=$packages',
       if (args.flag('print-wasm')) '--print-wasm',
       if (args.flag('print-kernel')) '--print-kernel',
-      if (args.flag('enable-asserts')) '--enable-asserts',
+      if (args.flag(enableAssertsOption.flag)) '--${enableAssertsOption.flag}',
       if (!generateSourceMap) '--no-source-maps',
       for (final define in defines) '-D$define',
       if (maxPages != null) ...[
@@ -1074,27 +1085,29 @@ Sets the verbosity level of the compilation.
     flagDefaultsTo: true,
   );
 
-  final Option defineOption;
-  final Option packagesOption;
-
-  CompileSubcommandCommand(super.name, super.description, super.verbose,
-      {super.hidden})
-      : defineOption = Option(
-          flag: 'define',
-          abbr: 'D',
-          valueHelp: 'key=value',
-          help: '''
+  late final Option defineOption = Option(
+    flag: 'define',
+    abbr: 'D',
+    valueHelp: 'key=value',
+    help: '''
 Define an environment declaration. To specify multiple declarations, use multiple options or use commas to separate key-value pairs.
 For example: dart compile $name -Da=1,b=2 main.dart''',
-        ),
-        packagesOption = Option(
-            flag: 'packages',
-            abbr: 'p',
-            valueHelp: 'path',
-            help:
-                '''Get package locations from the specified file instead of .dart_tool/package_config.json.
+  );
+
+  late final Option packagesOption = Option(
+      flag: 'packages',
+      abbr: 'p',
+      valueHelp: 'path',
+      help:
+          '''Get package locations from the specified file instead of .dart_tool/package_config.json.
 <path> can be relative or absolute.
 For example: dart compile $name --packages=/tmp/pkgs.json main.dart''');
+
+  final Option enableAssertsOption =
+      Option(flag: 'enable-asserts', help: 'Enable assert statements.');
+
+  CompileSubcommandCommand(super.name, super.description, super.verbose,
+      {super.hidden});
 }
 
 class CompileCommand extends DartdevCommand {

pkg/dartdev/test/commands/compile_test.dart

@@ -1481,6 +1481,39 @@ void main() {
     expect(result.exitCode, 254);
   });
 
+  test('Compile JIT snapshot with asserts', () async {
+    final p = project(mainSrc: '''
+void main() {
+  assert(int.parse('1') == 2);
+}
+''');
+    final inFile = path.canonicalize(path.join(p.dirPath, p.relativeFilePath));
+    final outFile = path.canonicalize(path.join(p.dirPath, 'myjit'));
+
+    var result = await p.run(
+      [
+        'compile',
+        'jit-snapshot',
+        '--enable-asserts',
+        '-o',
+        outFile,
+        inFile,
+      ],
+    );
+
+    // Only printed when -v/--verbose is used, not --verbosity.
+    expect(result.stdout, isNot(contains(usingTargetOSMessage)));
+    expect(result.stdout, isNot(contains(soundNullSafetyMessage)));
+    expect(result.stderr, contains(failedAssertionError));
+    expect(result.exitCode, 255);
+
+    result = await p.run(
+      ['--enable-asserts', outFile],
+    );
+    expect(result.stdout, isEmpty);
+    expect(result.stderr, contains(failedAssertionError));
+  });
+
   if (Platform.isMacOS) {
     test('Compile and run executable from signed dartaotruntime', () async {
       // Either the locally built dartaotruntime is already linker signed

pkg/dev_compiler/lib/src/command/command.dart

@@ -96,57 +96,7 @@ Future<CompilerResult> _compile(
   bool useIncrementalCompiler = false,
   Map<Uri, List<int>>? inputDigests,
 }) async {
-  // TODO(jmesserly): refactor options to share code with dartdevc CLI.
-  var argParser = ArgParser(allowTrailingOptions: true)
-    ..addFlag(
-      'help',
-      abbr: 'h',
-      help: 'Display this message.',
-      negatable: false,
-    )
-    ..addOption('packages', help: 'The package spec file to use.')
-    // TODO(jmesserly): is this still useful for us, or can we remove it now?
-    ..addFlag(
-      'summarize-text',
-      help: 'Emit API summary and AST in .js.txt and .ast.xml files.',
-      defaultsTo: false,
-      hide: true,
-    )
-    ..addFlag(
-      'track-widget-creation',
-      help: 'Enable inspecting of Flutter widgets.',
-      defaultsTo: false,
-      hide: true,
-    )
-    // TODO(jmesserly): add verbose help to show hidden options
-    ..addOption(
-      'dart-sdk-summary',
-      help: 'The path to the Dart SDK summary file.',
-      hide: true,
-    )
-    ..addMultiOption(
-      'multi-root',
-      help:
-          'The directories to search when encountering uris with the '
-          'specified multi-root scheme.',
-      defaultsTo: [Uri.base.path],
-    )
-    ..addFlag(
-      'compile-sdk',
-      help: 'Build an SDK module.',
-      defaultsTo: false,
-      hide: true,
-    )
-    ..addOption(
-      'libraries-file',
-      help: 'The path to the libraries.json file for the sdk.',
-    )
-    ..addOption(
-      'used-inputs-file',
-      help: 'If set, the file to record inputs used.',
-      hide: true,
-    );
-  Options.addArguments(argParser);
+  var argParser = Options.nonSdkArgParser();
   var declaredVariables = parseAndRemoveDeclaredVariables(args);
   ArgResults argResults;
   try {

pkg/dev_compiler/lib/src/command/options.dart

@@ -153,6 +153,9 @@ class Options {
         summaryModules: _parseCustomSummaryModules(
           args['summary'] as List<String>,
         ),
+        nonHotReloadablePackages: Set.from(
+          args['non-hot-reloadable-package'] as List<String>,
+        ),
         moduleFormats: parseModuleFormatOption(args),
         moduleName: _getModuleName(args),
         multiRootScheme: args['multi-root-scheme'] as String,
@@ -194,6 +197,14 @@ class Options {
             'API summary file(s) of imported libraries, optionally\n'
             'with module import path: -s path.dill=js/import/path',
       )
+      ..addMultiOption(
+        'non-hot-reloadable-package',
+        help:
+            'Specifies that a package should not be hot reloaded.\n'
+            'Hot reload will be rejected when any such package is modified. '
+            'This allows the compiler to emit these packages with better '
+            'performance.',
+      )
       ..addFlag(
         'summarize',
         help: 'Emit an API summary file.',
@@ -227,8 +238,8 @@ class Options {
         defaultsTo: false,
         hide: hide,
       )
-      // TODO(41852) Define a process for breaking changes before graduating
-      // from experimental.
+      // TODO(41852) Define a process for breaking changes before graduating from
+      // experimental.
       ..addFlag(
         'experimental-emit-debug-metadata',
         help:
@@ -368,6 +379,63 @@ class Options {
     // that build systems do not depend on passing windows-style paths here.
     return p.toUri(moduleName).toString();
   }
+
+  /// Returns an `ArgParser` for arguments compatible with non-SDK DDC
+  /// compilations.
+  static ArgParser nonSdkArgParser() {
+    // TODO(jmesserly): refactor options to share code with dartdevc CLI.
+    var argParser = ArgParser(allowTrailingOptions: true)
+      ..addFlag(
+        'help',
+        abbr: 'h',
+        help: 'Display this message.',
+        negatable: false,
+      )
+      ..addOption('packages', help: 'The package spec file to use.')
+      // TODO(jmesserly): is this still useful for us, or can we remove it now?
+      ..addFlag(
+        'summarize-text',
+        help: 'Emit API summary and AST in .js.txt and .ast.xml files.',
+        defaultsTo: false,
+        hide: true,
+      )
+      ..addFlag(
+        'track-widget-creation',
+        help: 'Enable inspecting of Flutter widgets.',
+        defaultsTo: false,
+        hide: true,
+      )
+      // TODO(jmesserly): add verbose help to show hidden options
+      ..addOption(
+        'dart-sdk-summary',
+        help: 'The path to the Dart SDK summary file.',
+        hide: true,
+      )
+      ..addMultiOption(
+        'multi-root',
+        help:
+            'The directories to search when encountering uris with the '
+            'specified multi-root scheme.',
+        defaultsTo: [Uri.base.path],
+      )
+      ..addFlag(
+        'compile-sdk',
+        help: 'Build an SDK module.',
+        defaultsTo: false,
+        hide: true,
+      )
+      ..addOption(
+        'libraries-file',
+        help: 'The path to the libraries.json file for the sdk.',
+      )
+      ..addOption(
+        'used-inputs-file',
+        help: 'If set, the file to record inputs used.',
+        hide: true,
+      );
+    Options.addArguments(argParser);
+    return argParser;
+  }
 }
 
 /// Finds explicit module names of the form `path=name` in [summaryPaths],