Version 3.5.0-270.0.dev

Merge 856139b into dev
dart-lang · Jun 17, 2024 · 1ce6b4d · 1ce6b4d
2 parents 4f8c8c4 + 856139b
commit 1ce6b4d
Show file tree

Hide file tree

Showing 21 changed files with 658 additions and 308 deletions.
diff --git a/DEPS b/DEPS
@@ -180,7 +180,7 @@ vars = {
   "stream_channel_rev": "b41ff7a25395ace8b23e454e3d1a3459a71306ca",
   "string_scanner_rev": "7b37c1b3d1ca6b581792e6ba385f651573af4a45",
   "sync_http_rev": "7622bdd07501f3f279212e355325b7c84a2b0a08",
-  "tar_rev": "b62573f39a4de28f69d9ed82b02fbd96b12b9633",
+  "tar_rev": "552a49d7595e444184d4f91e9afd533aa253a31d",
   "term_glyph_rev": "c86e8171ee7e9f6fc8e775e0be755a603dd0b72d",
   "test_rev": "329c6dff4dfcb178ba6c7009cf1c1b9215b317aa",
   "test_descriptor_rev": "b23d7ccb0f9882e161fb4dea75b2237bf428432b",

diff --git a/pkg/front_end/lib/src/fasta/builder/library_builder.dart b/pkg/front_end/lib/src/fasta/builder/library_builder.dart
@@ -196,6 +196,9 @@ abstract class SourceCompilationUnit implements CompilationUnit {
 
   void addDependencies(Library library, Set<SourceLibraryBuilder> seen);
 
+  void includeParts(SourceLibraryBuilder libraryBuilder,
+      List<SourceCompilationUnit> includedParts, Set<Uri> usedParts);
+
   void validatePart(SourceLibraryBuilder? library, Set<Uri>? usedParts);
 
   void addScriptToken(int charOffset);

diff --git a/pkg/front_end/lib/src/fasta/builder_graph.dart b/pkg/front_end/lib/src/fasta/builder_graph.dart
@@ -16,7 +16,7 @@ import 'import.dart' show Import;
 
 import 'dill/dill_library_builder.dart' show DillLibraryBuilder;
 
-import 'source/source_library_builder.dart' show Part, SourceLibraryBuilder;
+import 'source/source_library_builder.dart' show SourceLibraryBuilder;
 
 import 'incremental_compiler.dart' show getPartUri;
 
@@ -52,8 +52,8 @@ class BuilderGraph implements Graph<Uri> {
           neighbors.add(uri);
         }
       }
-      for (Part part in libraryBuilder.parts) {
-        Uri uri = part.compilationUnit.importUri;
+      for (SourceCompilationUnit part in libraryBuilder.parts) {
+        Uri uri = part.importUri;
         if (libraryBuilders.containsKey(uri)) {
           neighbors.add(uri);
         }

diff --git a/pkg/front_end/lib/src/fasta/export.dart b/pkg/front_end/lib/src/fasta/export.dart
@@ -29,7 +29,7 @@ class Export {
 
   /// The [LibraryDependency] node corresponding to this import.
   ///
-  /// This set in [SourceLibraryBuilder.addDependencies].
+  /// This set in [SourceLibraryBuilder._addDependencies].
   late final LibraryDependency libraryDependency;
 
   bool addToExportScope(String name, Builder member) {

diff --git a/pkg/front_end/lib/src/fasta/import.dart b/pkg/front_end/lib/src/fasta/import.dart
@@ -49,7 +49,7 @@ class Import {
 
   /// The [LibraryDependency] node corresponding to this import.
   ///
-  /// This set in [SourceLibraryBuilder.addDependencies].
+  /// This set in [SourceLibraryBuilder._addDependencies].
   LibraryDependency? libraryDependency;
 
   Import(

diff --git a/pkg/front_end/lib/src/fasta/incremental_compiler.dart b/pkg/front_end/lib/src/fasta/incremental_compiler.dart
@@ -101,7 +101,7 @@ import 'source/source_library_builder.dart'
 import 'source/source_loader.dart';
 import 'ticker.dart' show Ticker;
 import 'uri_translator.dart' show UriTranslator;
-import 'uris.dart' show dartCore;
+import 'uris.dart' show MALFORMED_URI_SCHEME, dartCore;
 import 'util/error_reporter_file_copier.dart' show saveAsGzip;
 import 'util/experiment_environment_getter.dart'
     show enableIncrementalCompilerBenchmarking, getExperimentEnvironment;
@@ -2268,7 +2268,7 @@ class _ExtensionTypeFinder extends VisitorDefault<void> with VisitorVoidMixin {
 ///     Uri.parse("file://path/to/parent.dart"),
 ///     new LibraryPart([], ":hello")
 ///   ),
-///   new Uri(scheme: SourceLibraryBuilder.MALFORMED_URI_SCHEME,
+///   new Uri(scheme: MALFORMED_URI_SCHEME,
 ///     query: Uri.encodeQueryComponent(":hello"))
 /// )
 /// ```
@@ -2278,7 +2278,7 @@ Uri getPartUri(Uri parentUri, LibraryPart part) {
   } on FormatException {
     // This is also done in [SourceLibraryBuilder.resolve]
     return new Uri(
-        scheme: SourceLibraryBuilder.MALFORMED_URI_SCHEME,
+        scheme: MALFORMED_URI_SCHEME,
         query: Uri.encodeQueryComponent(part.partUri));
   }
 }

diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
@@ -71,6 +71,7 @@ import '../modifier.dart'
         staticMask;
 import '../operator.dart' show Operator;
 import '../problems.dart' show unhandled;
+import '../uris.dart';
 import 'offset_map.dart';
 import 'source_enum_builder.dart';
 import 'source_library_builder.dart'
@@ -876,7 +877,7 @@ class OutlineBuilder extends StackListenerImpl {
     } else {
       Token beginToken = pop() as Token;
       int charOffset = beginToken.charOffset;
-      push("${SourceLibraryBuilder.MALFORMED_URI_SCHEME}:bad${charOffset}");
+      push("${MALFORMED_URI_SCHEME}:bad${charOffset}");
       push(charOffset);
       // Point to dollar sign
       int interpolationOffset = charOffset + beginToken.lexeme.length;