Version 3.5.0-271.0.dev

Merge 5641607 into dev
dart-lang · Jun 17, 2024 · 51bbba0 · 51bbba0
2 parents 1ce6b4d + 5641607
commit 51bbba0
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 135 deletions.
diff --git a/DEPS b/DEPS
@@ -169,7 +169,7 @@ vars = {
   "path_rev": "04807b61c25f98f328b322ec511451f9f86f98bb",
   "pool_rev": "88e463600c636a0d8cdb5dc306524ebf04b06baf",
   "protobuf_rev": "ccf104dbc36929c0f8708285d5f3a8fae206343e",
-  "pub_rev": "9ab905a24e36ef339c99f73bfb6683874feed8ce", # disable tools/rev_sdk_deps.dart
+  "pub_rev": "ddc1c2fd2e2a7cd94a0b92ea033961a25f4ad517", # disable tools/rev_sdk_deps.dart
   "pub_semver_rev": "a9025f3cc23ebb0f86c0af8759d95306b9133ce0",
   "shelf_rev": "4c54af6b6baa9404826d234385c1bf69575dfd47",
   "source_map_stack_trace_rev": "96a8213dacf7cd42aefb1311491a4169826f98d2",

diff --git a/pkg/dds/lib/src/dds_cli_entrypoint.dart b/pkg/dds/lib/src/dds_cli_entrypoint.dart
@@ -129,7 +129,6 @@ ${argParser.usage}
           'uri': dtdInfo.uri,
         },
     }));
-    stderr.close();
   } catch (e, st) {
     writeErrorResponse(e, st);
   } finally {

diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -4195,49 +4195,35 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       return;
     }
 
-    // Merge import and export lists to have the dependencies in source order.
-    // This is required for the DietListener to correctly match up metadata.
-    int importIndex = 0;
-    int exportIndex = 0;
-    while (importIndex < imports.length || exportIndex < exports.length) {
-      if (exportIndex >= exports.length ||
-          (importIndex < imports.length &&
-              imports[importIndex].charOffset <
-                  exports[exportIndex].charOffset)) {
-        // Add import
-        Import import = imports[importIndex++];
-
-        // Rather than add a LibraryDependency, we attach an annotation.
-        if (import.nativeImportPath != null) {
-          addNativeDependency(import.nativeImportPath!);
-          continue;
-        }
+    for (Import import in imports) {
+      // Rather than add a LibraryDependency, we attach an annotation.
+      if (import.nativeImportPath != null) {
+        addNativeDependency(import.nativeImportPath!);
+        continue;
+      }
 
-        LibraryDependency libraryDependency;
-        if (import.deferred && import.prefixBuilder?.dependency != null) {
-          libraryDependency = import.prefixBuilder!.dependency!;
-        } else {
-          LibraryBuilder imported = import.importedLibraryBuilder!.origin;
-          Library targetLibrary = imported.library;
-          libraryDependency = new LibraryDependency.import(targetLibrary,
-              name: import.prefix,
-              combinators: toKernelCombinators(import.combinators))
-            ..fileOffset = import.charOffset;
-        }
-        library.addDependency(libraryDependency);
-        import.libraryDependency = libraryDependency;
+      LibraryDependency libraryDependency;
+      if (import.deferred && import.prefixBuilder?.dependency != null) {
+        libraryDependency = import.prefixBuilder!.dependency!;
       } else {
-        // Add export
-        Export export = exports[exportIndex++];
-        LibraryDependency libraryDependency = new LibraryDependency.export(
-            export.exportedLibraryBuilder.library,
-            combinators: toKernelCombinators(export.combinators))
-          ..fileOffset = export.charOffset;
-        library.addDependency(libraryDependency);
-        export.libraryDependency = libraryDependency;
+        LibraryBuilder imported = import.importedLibraryBuilder!.origin;
+        Library targetLibrary = imported.library;
+        libraryDependency = new LibraryDependency.import(targetLibrary,
+            name: import.prefix,
+            combinators: toKernelCombinators(import.combinators))
+          ..fileOffset = import.charOffset;
       }
+      library.addDependency(libraryDependency);
+      import.libraryDependency = libraryDependency;
+    }
+    for (Export export in exports) {
+      LibraryDependency libraryDependency = new LibraryDependency.export(
+          export.exportedLibraryBuilder.library,
+          combinators: toKernelCombinators(export.combinators))
+        ..fileOffset = export.charOffset;
+      library.addDependency(libraryDependency);
+      export.libraryDependency = libraryDependency;
     }
-
     for (SourceCompilationUnit part in parts) {
       part.addDependencies(library, seen);
     }