Version 3.5.0-310.0.dev

Merge f9cd243 into dev
dart-lang · Jun 27, 2024 · e7022f6 · e7022f6
2 parents b5f079c + f9cd243
commit e7022f6
Show file tree

Hide file tree

Showing 11 changed files with 570 additions and 528 deletions.
diff --git a/pkg/front_end/lib/src/base/incremental_compiler.dart b/pkg/front_end/lib/src/base/incremental_compiler.dart
@@ -1912,18 +1912,11 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
                     combinator.fileOffset, libraryBuilder.fileUri));
           }
 
-          debugLibrary.compilationUnit.addImport(
-              metadata: null,
-              isAugmentationImport: false,
+          debugLibrary.compilationUnit.addSyntheticImport(
               uri: dependency.importedLibraryReference.canonicalName!.name,
-              configurations: null,
               prefix: dependency.name,
               combinators: combinators,
-              deferred: dependency.isDeferred,
-              charOffset: -1,
-              prefixCharOffset: -1,
-              uriOffset: -1,
-              importIndex: -1);
+              deferred: dependency.isDeferred);
         }
 
         debugLibrary.addImportsToScope();

diff --git a/pkg/front_end/lib/src/builder/formal_parameter_builder.dart b/pkg/front_end/lib/src/builder/formal_parameter_builder.dart
@@ -18,6 +18,7 @@ import '../kernel/body_builder.dart' show BodyBuilder;
 import '../kernel/body_builder_context.dart';
 import '../kernel/internal_ast.dart' show VariableDeclarationImpl;
 import '../source/constructor_declaration.dart';
+import '../source/builder_factory.dart';
 import '../source/source_factory_builder.dart';
 import '../source/source_field_builder.dart';
 import '../source/source_library_builder.dart';
@@ -193,10 +194,9 @@ class FormalParameterBuilder extends ModifierBuilderImpl
         kind, type.clone(newTypes, contextLibrary, contextDeclaration), name);
   }
 
-  FormalParameterBuilder forPrimaryConstructor(
-      SourceCompilationUnit compilationUnit) {
+  FormalParameterBuilder forPrimaryConstructor(BuilderFactory builderFactory) {
     return new FormalParameterBuilder(kind, modifiers | initializingFormalMask,
-        compilationUnit.addInferableType(), name, null, charOffset,
+        builderFactory.addInferableType(), name, null, charOffset,
         fileUri: fileUri,
         isExtensionThis: isExtensionThis,
         hasImmediatelyDeclaredInitializer: hasImmediatelyDeclaredInitializer)