Skip to content

Commit 27952c5

Browse files
johnniwintherCommit Queue
johnniwinther
authored and
Commit Queue
committed
[cfe] Remove ConstructorDeclarationBuilder
This interface is no longer needed since SourceConstructorBuilder is the only implementation. Change-Id: Ic6426d4c0dbc3820e460a1e4fdc69f323c763885 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432942 Reviewed-by: Chloe Stefantsova <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent 4e9d539 commit 27952c5

File tree

8 files changed

+61
-120
lines changed

8 files changed

+61
-120
lines changed

‎pkg/front_end/lib/src/builder/formal_parameter_builder.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import '../kernel/body_builder_context.dart';
2323
import '../kernel/internal_ast.dart' show VariableDeclarationImpl;
2424
import '../kernel/wildcard_lowering.dart';
2525
import '../source/builder_factory.dart';
26-
import '../source/constructor_declaration.dart';
26+
import '../source/source_constructor_builder.dart';
2727
import '../source/source_factory_builder.dart';
2828
import '../source/source_library_builder.dart';
2929
import '../source/source_property_builder.dart';
@@ -235,13 +235,13 @@ class FormalParameterBuilder extends NamedBuilderImpl
235235

236236
void finalizeInitializingFormal(
237237
DeclarationBuilder declarationBuilder,
238-
ConstructorDeclarationBuilder constructorDeclaration,
238+
SourceConstructorBuilder constructorBuilder,
239239
ClassHierarchyBase hierarchy) {
240240
String fieldName = isWildcardLoweredFormalParameter(name) ? '_' : name;
241241
Builder? fieldBuilder = declarationBuilder.lookupLocalMember(fieldName);
242242
if (fieldBuilder is SourcePropertyBuilder && fieldBuilder.hasField) {
243243
DartType fieldType = fieldBuilder.inferFieldType(hierarchy);
244-
fieldType = constructorDeclaration.substituteFieldType(fieldType);
244+
fieldType = constructorBuilder.substituteFieldType(fieldType);
245245
type.registerInferredType(fieldType);
246246
} else {
247247
type.registerInferredType(const DynamicType());

‎pkg/front_end/lib/src/kernel/body_builder.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ import '../codes/cfe_codes.dart' as cfe;
9898
import '../dill/dill_library_builder.dart' show DillLibraryBuilder;
9999
import '../dill/dill_type_parameter_builder.dart';
100100
import '../fragment/fragment.dart';
101-
import '../source/constructor_declaration.dart';
102101
import '../source/diet_parser.dart';
103102
import '../source/offset_map.dart';
103+
import '../source/source_constructor_builder.dart';
104104
import '../source/source_library_builder.dart';
105105
import '../source/source_member_builder.dart';
106106
import '../source/source_property_builder.dart';
@@ -9314,7 +9314,7 @@ class BodyBuilder extends StackListenerImpl
93149314
cfe.messageUnexpectedSuperParametersInGenerativeConstructors,
93159315
formal.fileOffset,
93169316
noLength);
9317-
if (constructorBuilder is ConstructorDeclarationBuilder) {
9317+
if (constructorBuilder is SourceConstructorBuilder) {
93189318
constructorBuilder.markAsErroneous();
93199319
}
93209320
}

‎pkg/front_end/lib/src/kernel/kernel_target.dart‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import '../builder/type_builder.dart';
5858
import '../dill/dill_target.dart' show DillTarget;
5959
import '../fragment/constructor/declaration.dart';
6060
import '../source/class_declaration.dart';
61-
import '../source/constructor_declaration.dart';
6261
import '../source/name_scheme.dart';
6362
import '../source/source_class_builder.dart' show SourceClassBuilder;
6463
import '../source/source_constructor_builder.dart';
@@ -1382,15 +1381,15 @@ class KernelTarget {
13821381
}
13831382
}
13841383

1385-
Map<ConstructorDeclarationBuilder, Set<SourcePropertyBuilder>>
1384+
Map<SourceConstructorBuilder, Set<SourcePropertyBuilder>>
13861385
constructorInitializedFields = new Map.identity();
13871386
Set<SourcePropertyBuilder>? initializedFieldBuilders = null;
13881387
Set<SourcePropertyBuilder>? uninitializedInstanceFields;
13891388

1390-
Iterator<ConstructorDeclarationBuilder> constructorIterator =
1389+
Iterator<SourceConstructorBuilder> constructorIterator =
13911390
classDeclaration.filteredConstructorsIterator(includeDuplicates: false);
13921391
while (constructorIterator.moveNext()) {
1393-
ConstructorDeclarationBuilder constructor = constructorIterator.current;
1392+
SourceConstructorBuilder constructor = constructorIterator.current;
13941393
if (constructor.isEffectivelyRedirecting) continue;
13951394
if (constructor.isConst && nonFinalFields.isNotEmpty) {
13961395
classDeclaration.libraryBuilder.addProblem(
@@ -1476,10 +1475,9 @@ class KernelTarget {
14761475

14771476
// Run through all fields that are initialized by some constructor, and
14781477
// make sure that all other constructors also initialize them.
1479-
for (MapEntry<ConstructorDeclarationBuilder,
1480-
Set<SourcePropertyBuilder>> entry
1478+
for (MapEntry<SourceConstructorBuilder, Set<SourcePropertyBuilder>> entry
14811479
in constructorInitializedFields.entries) {
1482-
ConstructorDeclarationBuilder constructorBuilder = entry.key;
1480+
SourceConstructorBuilder constructorBuilder = entry.key;
14831481
Set<SourcePropertyBuilder> fieldBuilders = entry.value;
14841482
bool hasReportedErrors = false;
14851483
for (SourcePropertyBuilder fieldBuilder

‎pkg/front_end/lib/src/source/constructor_declaration.dart‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎pkg/front_end/lib/src/source/source_constructor_builder.dart‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import '../kernel/kernel_helper.dart' show DelayedDefaultValueCloner;
3232
import '../kernel/type_algorithms.dart';
3333
import '../type_inference/inference_results.dart';
3434
import '../type_inference/type_inference_engine.dart';
35-
import 'constructor_declaration.dart';
3635
import 'name_scheme.dart';
3736
import 'source_class_builder.dart';
3837
import 'source_library_builder.dart' show SourceLibraryBuilder;
@@ -142,11 +141,7 @@ class InferableConstructor implements InferableMember {
142141
}
143142

144143
class SourceConstructorBuilder extends SourceMemberBuilderImpl
145-
implements
146-
ConstructorBuilder,
147-
SourceMemberBuilder,
148-
Inferable,
149-
ConstructorDeclarationBuilder {
144+
implements ConstructorBuilder, SourceMemberBuilder, Inferable {
150145
@override
151146
final String name;
152147

@@ -296,7 +291,11 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
296291
// Coverage-ignore(suite): Not run.
297292
bool get isDeclarationInstanceMember => false;
298293

299-
@override
294+
/// Returns `true` if this constructor, including its augmentations, is
295+
/// external.
296+
///
297+
/// An augmented constructor is considered external if all of the origin
298+
/// and augmentation constructors are external.
300299
bool get isEffectivelyExternal {
301300
bool isExternal = this.isExternal;
302301
if (isExternal) {
@@ -307,7 +306,13 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
307306
return isExternal;
308307
}
309308

310-
@override
309+
/// Returns `true` if this constructor or any of its augmentations are
310+
/// redirecting.
311+
///
312+
/// An augmented constructor is considered redirecting if any of the origin
313+
/// or augmentation constructors is redirecting. Since it is an error if more
314+
/// than one is redirecting, only one can be redirecting in the without
315+
/// errors.
311316
bool get isEffectivelyRedirecting {
312317
bool isRedirecting = _introductory.isRedirecting;
313318
if (!isRedirecting) {
@@ -385,7 +390,6 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
385390

386391
List<Initializer> get _initializers => _lastDeclaration.initializers;
387392

388-
@override
389393
void addInitializer(Initializer initializer, ExpressionGeneratorHelper helper,
390394
{required InitializerInferenceResult? inferenceResult,
391395
required TreeNode parent}) {
@@ -628,7 +632,6 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
628632
inferFormalTypes(hierarchy);
629633
}
630634

631-
@override
632635
void prepareInitializers() {
633636
_introductory.prepareInitializers();
634637
for (ConstructorDeclaration augmentation in _augmentations) {
@@ -638,22 +641,33 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
638641
superInitializer = null;
639642
}
640643

641-
@override
642644
void prependInitializer(Initializer initializer) {
643645
_lastDeclaration.prependInitializer(initializer);
644646
}
645647

646-
@override
648+
/// Registers field as being initialized by this constructor.
649+
///
650+
/// The field can be initialized either via an initializing formal or via an
651+
/// entry in the constructor initializer list.
647652
void registerInitializedField(SourcePropertyBuilder fieldBuilder) {
648653
(_initializedFields ??= {}).add(fieldBuilder);
649654
}
650655

651-
@override
656+
/// Substitute [fieldType] from the context of the enclosing class or
657+
/// extension type declaration to this constructor.
658+
///
659+
/// This is used for generic extension type constructors where the type
660+
/// variable referring to the class type parameters must be substituted for
661+
/// the synthesized constructor type parameters.
652662
DartType substituteFieldType(DartType fieldType) {
653663
return _fieldTypeSubstitution.substituteType(fieldType);
654664
}
655665

656-
@override
666+
/// Returns the fields registered as initialized by this constructor.
667+
///
668+
/// Returns the set of fields previously registered via
669+
/// [registerInitializedField] and passes on the ownership of the collection
670+
/// to the caller.
657671
Set<SourcePropertyBuilder>? takeInitializedFields() {
658672
Set<SourcePropertyBuilder>? result = _initializedFields;
659673
_initializedFields = null;
@@ -671,7 +685,11 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
671685
_initializers.add(lastInitializer);
672686
}
673687

674-
@override
688+
/// Mark the constructor as erroneous.
689+
///
690+
/// This is used during the compilation phase to set the appropriate flag on
691+
/// the input AST node. The flag helps the verifier to skip apriori erroneous
692+
/// members and to avoid reporting cascading errors.
675693
void markAsErroneous() {
676694
_introductory.markAsErroneous();
677695
for (ConstructorDeclaration augmentation in _augmentations)

‎pkg/front_end/lib/src/type_inference/inference_visitor.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import '../kernel/hierarchy/class_member.dart';
5959
import '../kernel/implicit_type_argument.dart' show ImplicitTypeArgument;
6060
import '../kernel/internal_ast.dart';
6161
import '../kernel/late_lowering.dart' as late_lowering;
62-
import '../source/constructor_declaration.dart';
62+
import '../source/source_constructor_builder.dart';
6363
import '../source/source_library_builder.dart';
6464
import '../source/source_loader.dart';
6565
import 'closure_context.dart';
@@ -152,7 +152,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
152152
@override
153153
final TypeAnalyzerOptions typeAnalyzerOptions;
154154

155-
final ConstructorDeclarationBuilder? constructorDeclaration;
155+
final SourceConstructorBuilder? _constructorBuilder;
156156

157157
@override
158158
late final SharedTypeAnalyzerErrors errors = new SharedTypeAnalyzerErrors(
@@ -176,7 +176,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
176176
bool _inTryOrLocalFunction = false;
177177

178178
InferenceVisitorImpl(TypeInferrerImpl inferrer, InferenceHelper helper,
179-
this.constructorDeclaration, this.operations, this.typeAnalyzerOptions)
179+
this._constructorBuilder, this.operations, this.typeAnalyzerOptions)
180180
: super(inferrer, helper);
181181

182182
@override
@@ -1574,7 +1574,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
15741574
@override
15751575
InitializerInferenceResult visitFieldInitializer(FieldInitializer node) {
15761576
DartType fieldType = node.field.type;
1577-
fieldType = constructorDeclaration!.substituteFieldType(fieldType);
1577+
fieldType = _constructorBuilder!.substituteFieldType(fieldType);
15781578
ExpressionInferenceResult initializerResult =
15791579
inferExpression(node.value, fieldType);
15801580
Expression initializer = ensureAssignableResult(
@@ -8485,7 +8485,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
84858485
ExtensionTypeRedirectingInitializer node) {
84868486
ensureMemberType(node.target);
84878487
List<TypeParameter> constructorTypeParameters =
8488-
constructorDeclaration!.function.typeParameters;
8488+
_constructorBuilder!.function.typeParameters;
84898489
List<DartType> typeArguments = new List<DartType>.generate(
84908490
constructorTypeParameters.length,
84918491
(int i) => new TypeParameterType.withDefaultNullability(
@@ -8517,7 +8517,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
85178517
InitializerInferenceResult visitExtensionTypeRepresentationFieldInitializer(
85188518
ExtensionTypeRepresentationFieldInitializer node) {
85198519
DartType fieldType = node.field.getterType;
8520-
fieldType = constructorDeclaration!.substituteFieldType(fieldType);
8520+
fieldType = _constructorBuilder!.substituteFieldType(fieldType);
85218521
ExpressionInferenceResult initializerResult =
85228522
inferExpression(node.value, fieldType);
85238523
Expression initializer = ensureAssignableResult(

‎pkg/front_end/lib/src/type_inference/type_inferrer.dart‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import '../base/instrumentation.dart' show Instrumentation;
1414
import '../base/scope.dart';
1515
import '../kernel/benchmarker.dart' show BenchmarkSubdivides, Benchmarker;
1616
import '../kernel/internal_ast.dart';
17-
import '../source/constructor_declaration.dart';
17+
import '../source/source_constructor_builder.dart';
1818
import '../source/source_library_builder.dart' show SourceLibraryBuilder;
1919
import 'closure_context.dart';
2020
import 'inference_helper.dart' show InferenceHelper;
@@ -55,10 +55,8 @@ abstract class TypeInferrer {
5555
DartType returnType, AsyncMarker asyncMarker, Statement body);
5656

5757
/// Performs type inference on the given constructor initializer.
58-
InitializerInferenceResult inferInitializer(
59-
InferenceHelper helper,
60-
ConstructorDeclarationBuilder constructorDeclaration,
61-
Initializer initializer);
58+
InitializerInferenceResult inferInitializer(InferenceHelper helper,
59+
SourceConstructorBuilder constructorBuilder, Initializer initializer);
6260

6361
/// Performs type inference on the given metadata annotations.
6462
void inferMetadata(
@@ -157,11 +155,11 @@ class TypeInferrerImpl implements TypeInferrer {
157155
libraryBuilder.libraryFeatures.soundFlowAnalysis.isEnabled);
158156

159157
InferenceVisitorBase _createInferenceVisitor(InferenceHelper helper,
160-
[ConstructorDeclarationBuilder? constructorDeclaration]) {
158+
[SourceConstructorBuilder? constructorBuilder]) {
161159
// For full (non-top level) inference, we need access to the
162160
// InferenceHelper so that we can perform error reporting.
163161
return new InferenceVisitorImpl(
164-
this, helper, constructorDeclaration, operations, typeAnalyzerOptions);
162+
this, helper, constructorBuilder, operations, typeAnalyzerOptions);
165163
}
166164

167165
@override
@@ -262,17 +260,15 @@ class TypeInferrerImpl implements TypeInferrer {
262260
}
263261

264262
@override
265-
InitializerInferenceResult inferInitializer(
266-
InferenceHelper helper,
267-
ConstructorDeclarationBuilder constructorDeclaration,
268-
Initializer initializer) {
263+
InitializerInferenceResult inferInitializer(InferenceHelper helper,
264+
SourceConstructorBuilder constructorBuilder, Initializer initializer) {
269265
// Use polymorphic dispatch on [KernelInitializer] to perform whatever
270266
// kind of type inference is correct for this kind of initializer.
271267
// TODO(paulberry): experiment to see if dynamic dispatch would be better,
272268
// so that the type hierarchy will be simpler (which may speed up "is"
273269
// checks).
274270
InferenceVisitorBase visitor =
275-
_createInferenceVisitor(helper, constructorDeclaration);
271+
_createInferenceVisitor(helper, constructorBuilder);
276272
InitializerInferenceResult result = visitor.inferInitializer(initializer);
277273
visitor.checkCleanState();
278274
return result;
@@ -375,13 +371,11 @@ class TypeInferrerImplBenchmarked implements TypeInferrer {
375371
}
376372

377373
@override
378-
InitializerInferenceResult inferInitializer(
379-
InferenceHelper helper,
380-
ConstructorDeclarationBuilder constructorDeclaration,
381-
Initializer initializer) {
374+
InitializerInferenceResult inferInitializer(InferenceHelper helper,
375+
SourceConstructorBuilder constructorBuilder, Initializer initializer) {
382376
benchmarker.beginSubdivide(BenchmarkSubdivides.inferInitializer);
383377
InitializerInferenceResult result =
384-
impl.inferInitializer(helper, constructorDeclaration, initializer);
378+
impl.inferInitializer(helper, constructorBuilder, initializer);
385379
benchmarker.endSubdivide();
386380
return result;
387381
}

0 commit comments

Comments
 (0)