Version 2.15.0-49.0.dev

Dart CI · Dart CI · commit 72f462ed2d34 · 2021-08-24T05:59:52.000-07:00
Merge commit 'b54269e2551608a388f11eb6ccd21a7c41d9b529' into 'dev'
diff --git a/DEPS b/DEPS
@@ -140,7 +140,7 @@ vars = {
   "pool_rev": "7abe634002a1ba8a0928eded086062f1307ccfae",
   "process_rev": "56ece43b53b64c63ae51ec184b76bd5360c28d0b",
   "protobuf_rev": "c1eb6cb51af39ccbaa1a8e19349546586a5c8e31",
-  "pub_rev": "9f2ddc02f066c68fb638ff65fbb73761ece23267",
+  "pub_rev": "cd7a43f2109f7e5eb22e73c7f4e15d25fd57598e",
   "pub_semver_rev": "f50d80ef10c4b2fa5f4c8878036a4d9342c0cc82",
   "resource_rev": "6b79867d0becf5395e5819a75720963b8298e9a7",
   "root_certificates_rev": "692f6d6488af68e0121317a9c2c9eb393eb0ee50",
diff --git a/codereview.settings b/codereview.settings
@@ -3,3 +3,4 @@ GERRIT_HOST: True
 CODE_REVIEW_SERVER: https://dart-review.googlesource.com
 VIEW_VC: https://dart.googlesource.com/sdk/+
 CC_LIST: reviews@dartlang.org
+USE_PYTHON3: True
diff --git a/pkg/dartdev/lib/dartdev.dart b/pkg/dartdev/lib/dartdev.dart
@@ -15,6 +15,7 @@ import 'package:devtools_server/devtools_server.dart';
 import 'package:meta/meta.dart';
 import 'package:pedantic/pedantic.dart';
 import 'package:pub/pub.dart';
+
 import 'package:usage/usage.dart';
 
 import 'src/analytics.dart';
@@ -36,6 +37,15 @@ import 'src/vm_interop_handler.dart';
 /// analytics logic, it has been moved here.
 Future<void> runDartdev(List<String> args, SendPort port) async {
   VmInteropHandler.initialize(port);
+
+  // TODO(sigurdm): Remove when top-level pub is removed.
+  if (args[0] == '__deprecated_pub') {
+    // This is the entry-point supporting the top-level `pub` script.
+    // ignore: deprecated_member_use
+    VmInteropHandler.exit(await deprecatedpubCommand().run(args.skip(1)));
+    return;
+  }
+
   if (args.contains('run')) {
     // These flags have a format that can't be handled by package:args, so while
     // they are valid flags we'll assume the VM has verified them by this point.
diff --git a/pkg/dartdev/lib/src/commands/create.dart b/pkg/dartdev/lib/src/commands/create.dart
@@ -102,14 +102,11 @@ class CreateCommand extends DartdevCommand {
     );
 
     if (argResults['pub']) {
-      if (!Sdk.checkArtifactExists(sdk.pubSnapshot)) {
-        return 255;
-      }
       log.stdout('');
       var progress = log.progress('Running pub get');
       var process = await startDartProcess(
         sdk,
-        [sdk.pubSnapshot, 'get', '--no-precompile'],
+        ['pub', 'get'],
         cwd: dir,
       );
 
diff --git a/pkg/dartdev/lib/src/sdk.dart b/pkg/dartdev/lib/src/sdk.dart
@@ -78,13 +78,6 @@ class Sdk {
         'devtools',
       );
 
-  String get pubSnapshot => path.absolute(
-        sdkPath,
-        'bin',
-        'snapshots',
-        'pub.dart.snapshot',
-      );
-
   static bool checkArtifactExists(String path) {
     if (!File(path).existsSync()) {
       log.stderr('Could not find $path. Have you built the full '
diff --git a/pkg/dartdev/test/analytics_test.dart b/pkg/dartdev/test/analytics_test.dart
@@ -99,7 +99,8 @@ Future<void> main() async {
     });
     test('create', () {
       final p = project(logAnalytics: true);
-      final result = p.runSync(['create', '-tpackage-simple', 'name']);
+      final result =
+          p.runSync(['create', '--no-pub', '-tpackage-simple', 'name']);
       expect(extractAnalytics(result), [
         {
           'hitType': 'screenView',
@@ -113,7 +114,7 @@ Future<void> main() async {
             'label': null,
             'value': null,
             'cd1': '0',
-            'cd3': ' template ',
+            'cd3': ' pub template ',
           }
         },
         {
diff --git a/pkg/dartdev/test/sdk_test.dart b/pkg/dartdev/test/sdk_test.dart
@@ -25,10 +25,6 @@ void _sdk() {
     expectFileExists(Sdk().analysisServerSnapshot);
   });
 
-  test('pub snapshot', () {
-    expectFileExists(Sdk().pubSnapshot);
-  });
-
   test('dds snapshot', () {
     expectFileExists(Sdk().ddsSnapshot);
   });
diff --git a/pkg/front_end/test/spell_checking_list_code.txt b/pkg/front_end/test/spell_checking_list_code.txt
@@ -1079,7 +1079,7 @@ rpc
 rs
 runnable
 s
-sand
+sandboxed
 sanitizing
 saw
 say
diff --git a/pkg/front_end/test/spell_checking_list_tests.txt b/pkg/front_end/test/spell_checking_list_tests.txt
@@ -820,7 +820,7 @@ row
 rows
 runtimes
 rv
-sand
+sandboxed
 saves
 scans
 scheduler
diff --git a/pkg/front_end/tool/ast_model.dart b/pkg/front_end/tool/ast_model.dart
@@ -505,17 +505,24 @@ class AstModel {
 ///
 /// If [printDump] is `true`, a dump of the model printed to stdout.
 Future<AstModel> deriveAstModel(Uri repoDir, {bool printDump: false}) async {
+  bool errorsFound = false;
   CompilerOptions options = new CompilerOptions();
   options.sdkRoot = computePlatformBinariesLocation(forceBuildDir: true);
   options.packagesFileUri = computePackageConfig(repoDir);
   options.onDiagnostic = (DiagnosticMessage message) {
     printDiagnosticMessage(message, print);
+    if (message.severity == Severity.error) {
+      errorsFound = true;
+    }
   };
 
   InternalCompilerResult compilerResult = (await kernelForProgramInternal(
       astLibraryUri, options,
       retainDataForTesting: true,
       requireMain: false)) as InternalCompilerResult;
+  if (errorsFound) {
+    throw 'Errors found';
+  }
   ClassHierarchy classHierarchy = compilerResult.classHierarchy!;
   CoreTypes coreTypes = compilerResult.coreTypes!;
   TypeEnvironment typeEnvironment =
@@ -524,7 +531,6 @@ Future<AstModel> deriveAstModel(Uri repoDir, {bool printDump: false}) async {
   Library astLibrary = compilerResult.component!.libraries
       .singleWhere((library) => library.importUri == astLibraryUri);
 
-  bool errorsFound = false;
   void reportError(String message) {
     print(message);
     errorsFound = true;
diff --git a/pkg/front_end/tool/generate_ast_coverage.dart b/pkg/front_end/tool/generate_ast_coverage.dart
@@ -29,6 +29,10 @@ Future<String> generateAstCoverage(Uri repoDir, [AstModel astModel]) async {
 class CoverageVisitorStrategy extends Visitor0Strategy {
   Map<String, Set<String>> nestedClassNames = {};
 
+  @override
+  String get generatorCommand =>
+      'dart pkg/front_end/tool/generate_ast_coverage.dart';
+
   @override
   String get returnType => 'void';
 
diff --git a/pkg/front_end/tool/generate_ast_equivalence.dart b/pkg/front_end/tool/generate_ast_equivalence.dart
@@ -30,6 +30,10 @@ class EquivalenceVisitorStrategy extends Visitor1Strategy {
 
   EquivalenceVisitorStrategy();
 
+  @override
+  String get generatorCommand =>
+      'dart pkg/front_end/tool/generate_ast_equivalence.dart';
+
   @override
   String get argumentType => 'Node';
 
@@ -414,13 +418,7 @@ class EquivalenceVisitorStrategy extends Visitor1Strategy {
 
   void generateHeader(AstModel astModel, StringBuffer sb) {
     sb.writeln('''
-// Copyright (c) 2021, 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.
-
-// NOTE: THIS FILE IS GENERATED. DO NOT EDIT.
-//
-// Run 'dart pkg/front_end/tool/generate_ast_equivalence.dart' to update.
+$preamble
 
 import 'package:kernel/ast.dart';
 import 'package:kernel/src/printer.dart';
@@ -434,7 +432,7 @@ part 'equivalence_helpers.dart';
 /// current assumptions. The current state has two modes. In the asserting mode,
 /// the default, inequivalences are registered when found. In the non-asserting
 /// mode, inequivalences are _not_ registered. The latter is used to compute
-/// equivalences in sand boxed state, for instance to determine which elements
+/// equivalences in sandboxed state, for instance to determine which elements
 /// to pair when checking equivalence of two sets.
 class $visitorName$visitorTypeParameters
     implements Visitor1<$returnType, $argumentType> {
diff --git a/pkg/front_end/tool/visitor_generator.dart b/pkg/front_end/tool/visitor_generator.dart
@@ -84,6 +84,23 @@ String generateVisitor(AstModel astModel, VisitorStrategy strategy,
 abstract class VisitorStrategy {
   const VisitorStrategy();
 
+  /// Preamble comment used in the generated file.
+  String get preamble => '''
+// Copyright (c) 2021, 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.
+
+// NOTE: THIS FILE IS GENERATED. DO NOT EDIT.
+//
+// Run '$generatorCommand' to update.
+''';
+
+  /// The command used to generate the visitor.
+  ///
+  /// This is inserted in the [preamble] along with a comment that the file
+  /// is generated.
+  String get generatorCommand;
+
   /// Comment used as doc comment for the generated visitor class.
   String get visitorComment => '';
 
@@ -128,6 +145,8 @@ abstract class Visitor0Strategy extends VisitorStrategy {
 
   void generateHeader(AstModel astModel, StringBuffer sb) {
     sb.writeln('''
+$preamble
+
 import 'package:kernel/ast.dart';
 
 $visitorComment
@@ -199,7 +218,7 @@ class $visitorName$visitorTypeParameters implements Visitor<$returnType> {''');
 }
 
 /// Strategy for creating an empty `Visitor<void>` implementation.
-class VoidVisitor0Strategy extends Visitor0Strategy {
+abstract class VoidVisitor0Strategy extends Visitor0Strategy {
   const VoidVisitor0Strategy();
 
   @override
@@ -312,7 +331,7 @@ class $visitorName$visitorTypeParameters
 }
 
 /// Strategy for creating an empty `Visitor1<void,Null>` implementation.
-class VoidVisitor1Strategy extends Visitor1Strategy {
+abstract class VoidVisitor1Strategy extends Visitor1Strategy {
   const VoidVisitor1Strategy();
 
   @override
diff --git a/pkg/kernel/lib/src/coverage.dart b/pkg/kernel/lib/src/coverage.dart
@@ -1,3 +1,11 @@
+// Copyright (c) 2021, 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.
+
+// NOTE: THIS FILE IS GENERATED. DO NOT EDIT.
+//
+// Run 'dart pkg/front_end/tool/generate_ast_coverage.dart' to update.
+
 import 'package:kernel/ast.dart';
 
 /// Recursive visitor that collects kinds for all visited nodes.
diff --git a/pkg/kernel/lib/src/equivalence.dart b/pkg/kernel/lib/src/equivalence.dart
@@ -18,7 +18,7 @@ part 'equivalence_helpers.dart';
 /// current assumptions. The current state has two modes. In the asserting mode,
 /// the default, inequivalences are registered when found. In the non-asserting
 /// mode, inequivalences are _not_ registered. The latter is used to compute
-/// equivalences in sand boxed state, for instance to determine which elements
+/// equivalences in sandboxed state, for instance to determine which elements
 /// to pair when checking equivalence of two sets.
 class EquivalenceVisitor implements Visitor1<bool, Node> {
   final EquivalenceStrategy strategy;
diff --git a/pkg/kernel/lib/src/union_find.dart b/pkg/kernel/lib/src/union_find.dart
@@ -2,6 +2,10 @@
 // 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.
 
+/// Implementation of a union-find algorithm.
+///
+/// See https://en.wikipedia.org/wiki/Disjoint-set_data_structure
+
 import 'dart:collection';
 
 class UnionFindNode<T> {
@@ -46,6 +50,7 @@ class UnionFind<T> {
 
   UnionFindNode<T> findNode(UnionFindNode<T> node) {
     if (node.parent != null) {
+      // Perform path compression by updating to the effective target.
       return node.parent = findNode(node.parent!);
     }
     return node;
diff --git a/pkg/kernel/test/equivalence_test.dart b/pkg/kernel/test/equivalence_test.dart
@@ -67,23 +67,22 @@ Values true and false are not equivalent
 '''),
   Test(component1, component2),
   Test(component1.libraries[0], component2.libraries[0]),
-  Test(component1.libraries[0], component2.libraries[0]),
   Test(component1.libraries[0], component2.libraries[1], inequivalence: '''
 Inequivalent nodes
-1: library file://uri1/
-2: library file://uri2/
+1: library import://uri1
+2: library import://uri2
 .root
 '''),
   Test(component1.libraries[1], component2.libraries[2], inequivalence: '''
 Inequivalent nodes
-1: library file://uri2/
-2: library file://uri3/
+1: library import://uri2
+2: library import://uri3
 .root
 '''),
   Test(component1.libraries[1], component2.libraries[3], inequivalence: '''
 Values file://uri2/ and file://uri3/ are not equivalent
 .root
- Library(library file://uri2/).fileUri
+ Library(library import://uri2).fileUri
 '''),
   Test(component1.libraries[0].procedures[0],
       component2.libraries[0].procedures[1],
@@ -173,31 +172,34 @@ class IgnoreIntLiteralValue extends EquivalenceStrategy {
 
 Component createComponent() {
   Component component = new Component();
-  Uri uri1 = Uri.parse('file://uri1');
-  Uri uri2 = Uri.parse('file://uri2');
-  Uri uri3 = Uri.parse('file://uri3');
-  Library library1 = new Library(uri1, fileUri: uri1);
+  Uri fileUri1 = Uri.parse('file://uri1');
+  Uri fileUri2 = Uri.parse('file://uri2');
+  Uri fileUri3 = Uri.parse('file://uri3');
+  Uri importUri1 = Uri.parse('import://uri1');
+  Uri importUri2 = Uri.parse('import://uri2');
+  Uri importUri3 = Uri.parse('import://uri3');
+  Library library1 = new Library(importUri1, fileUri: fileUri1);
   component.libraries.add(library1);
   Procedure procedure1foo = new Procedure(
       new Name('foo'), ProcedureKind.Method, new FunctionNode(null),
-      fileUri: uri1);
+      fileUri: fileUri1);
   library1.addProcedure(procedure1foo);
   Procedure procedure1bar = new Procedure(
       new Name('bar'), ProcedureKind.Method, new FunctionNode(null),
-      fileUri: uri1);
+      fileUri: fileUri1);
   library1.addProcedure(procedure1bar);
 
-  Library library2 = new Library(uri2, fileUri: uri2);
+  Library library2 = new Library(importUri2, fileUri: fileUri2);
   component.libraries.add(library2);
 
-  Library library3 = new Library(uri3, fileUri: uri2);
+  Library library3 = new Library(importUri3, fileUri: fileUri2);
   component.libraries.add(library3);
   Procedure procedure3foo = new Procedure(
       new Name('foo'), ProcedureKind.Method, new FunctionNode(null),
-      fileUri: uri1);
+      fileUri: fileUri1);
   library3.addProcedure(procedure3foo);
 
-  Library library4 = new Library(uri2, fileUri: uri3);
+  Library library4 = new Library(importUri2, fileUri: fileUri3);
   component.libraries.add(library4);
 
   return component;
diff --git a/pkg/test_runner/tool/update_static_error_tests.dart b/pkg/test_runner/tool/update_static_error_tests.dart
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
diff --git a/sdk/bin/pub b/sdk/bin/pub
diff --git a/sdk/bin/pub_sdk b/sdk/bin/pub_sdk
diff --git a/sdk/bin/pub_sdk.bat b/sdk/bin/pub_sdk.bat
diff --git a/tools/VERSION b/tools/VERSION
diff --git a/utils/pub/.gitignore b/utils/pub/.gitignore
diff --git a/utils/pub/BUILD.gn b/utils/pub/BUILD.gn

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,8 @@ Future<void> main() async {`
`99`	`99`	`});`
`100`	`100`	`test('create', () {`
`101`	`101`	`final p = project(logAnalytics: true);`
`102`		`- final result = p.runSync(['create', '-tpackage-simple', 'name']);`
	`102`	`+ final result =`
	`103`	`+ p.runSync(['create', '--no-pub', '-tpackage-simple', 'name']);`
`103`	`104`	`expect(extractAnalytics(result), [`
`104`	`105`	`{`
`105`	`106`	`'hitType': 'screenView',`
`@@ -113,7 +114,7 @@ Future<void> main() async {`
`113`	`114`	`'label': null,`
`114`	`115`	`'value': null,`
`115`	`116`	`'cd1': '0',`
`116`		`- 'cd3': ' template ',`
	`117`	`+ 'cd3': ' pub template ',`
`117`	`118`	`}`
`118`	`119`	`},`
`119`	`120`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1079,7 +1079,7 @@ rpc`
`1079`	`1079`	`rs`
`1080`	`1080`	`runnable`
`1081`	`1081`	`s`
`1082`		`-sand`
	`1082`	`+sandboxed`
`1083`	`1083`	`sanitizing`
`1084`	`1084`	`saw`
`1085`	`1085`	`say`