Skip to content

Commit e582b10

Browse files
johnniwintherCommit Queue
johnniwinther
authored and
Commit Queue
committed
[cfe] Remove SourceMemberBuilder.isAugmentation
This removes the SourceMemberBuilder.isAugmentation property along with other properties related to builder as augmentation. These no longer makes sense and the access to augmented members needs to be rebuilt when the augmentation feature is revived. Change-Id: Ic978d2f0f60eddacda924c887675eb9f4659a1ba Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426801 Commit-Queue: Johnni Winther <[email protected]> Reviewed-by: Chloe Stefantsova <[email protected]>
1 parent 5874ba3 commit e582b10

13 files changed

+3
-181
lines changed

‎pkg/front_end/lib/src/base/scope.dart‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -481,14 +481,6 @@ mixin ErroneousMemberBuilderMixin implements SourceMemberBuilder {
481481
@override
482482
bool get isConflictingSetter => false;
483483

484-
@override
485-
bool get isConflictingAugmentationMember => false;
486-
487-
@override
488-
void set isConflictingAugmentationMember(bool value) {
489-
throw new UnsupportedError('$runtimeType.isConflictingAugmentationMember=');
490-
}
491-
492484
@override
493485
DeclarationBuilder get declarationBuilder {
494486
throw new UnsupportedError('$runtimeType.declarationBuilder');
@@ -552,16 +544,6 @@ mixin ErroneousMemberBuilderMixin implements SourceMemberBuilder {
552544
TypeEnvironment typeEnvironment) {
553545
assert(false, "Unexpected call to $runtimeType.checkVariance.");
554546
}
555-
556-
@override
557-
bool get isAugmentation {
558-
throw new UnsupportedError('$runtimeType.isAugmentation');
559-
}
560-
561-
@override
562-
AugmentSuperTarget? get augmentSuperTarget {
563-
throw new UnsupportedError('$runtimeType.augmentSuperTarget}');
564-
}
565547
}
566548

567549
class AmbiguousMemberBuilder extends AmbiguousBuilder
@@ -789,7 +771,7 @@ class FilteredIterator<T extends Builder> implements Iterator<T> {
789771

790772
bool _include(Builder element) {
791773
if (!includeDuplicates &&
792-
(element.isDuplicate || element.isConflictingAugmentationMember)) {
774+
(element.isDuplicate)) {
793775
return false;
794776
}
795777
return element is T;
@@ -822,7 +804,7 @@ class FilteredNameIterator<T extends Builder> implements NameIterator<T> {
822804

823805
bool _include(Builder element) {
824806
if (!includeDuplicates &&
825-
(element.isDuplicate || element.isConflictingAugmentationMember)) {
807+
(element.isDuplicate)) {
826808
return false;
827809
}
828810
return element is T;
@@ -874,19 +856,6 @@ extension NameIteratorExtension<T extends Builder> on NameIterator<T> {
874856
}
875857
}
876858

877-
extension on Builder {
878-
bool get isConflictingAugmentationMember {
879-
Builder self = this;
880-
if (self is SourceMemberBuilder) {
881-
return self.isConflictingAugmentationMember;
882-
} else if (self is SourceClassBuilder) {
883-
return self.isConflictingAugmentationMember;
884-
}
885-
// TODO(johnniwinther): Handle all cases here.
886-
return false;
887-
}
888-
}
889-
890859
class IteratorSequence<T> implements Iterator<T> {
891860
Iterator<Iterator<T>> _iterators;
892861

‎pkg/front_end/lib/src/fragment/enum_element.dart‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,6 @@ class _EnumElementFragmentBodyBuilderContext extends BodyBuilderContext {
243243
// Coverage-ignore(suite): Not run.
244244
int get memberNameLength => _fragment.name.length;
245245

246-
@override
247-
// Coverage-ignore(suite): Not run.
248-
AugmentSuperTarget? get augmentSuperTarget {
249-
if (_fragment.builder.isAugmentation) {
250-
return _fragment.builder.augmentSuperTarget;
251-
}
252-
return null;
253-
}
254-
255246
@override
256247
// Coverage-ignore(suite): Not run.
257248
ConstantContext get constantContext {

‎pkg/front_end/lib/src/fragment/field/body_builder_context.dart‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,6 @@ class FieldFragmentBodyBuilderContext extends BodyBuilderContext {
6666
_declaration.registerSuperCall();
6767
}
6868

69-
@override
70-
// Coverage-ignore(suite): Not run.
71-
AugmentSuperTarget? get augmentSuperTarget {
72-
if (_builder.isAugmentation) {
73-
return _builder.augmentSuperTarget;
74-
}
75-
return null;
76-
}
77-
7869
@override
7970
ConstantContext get constantContext {
8071
return _isConst

‎pkg/front_end/lib/src/fragment/getter/body_builder_context.dart‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import '../../builder/formal_parameter_builder.dart';
1111
import '../../builder/type_builder.dart';
1212
import '../../kernel/body_builder_context.dart';
1313
import '../../source/source_library_builder.dart';
14-
import '../../source/source_member_builder.dart';
1514
import '../../source/source_property_builder.dart';
1615
import '../../type_inference/type_schema.dart';
1716
import 'declaration.dart';
@@ -29,15 +28,6 @@ class GetterFragmentBodyBuilderContext extends BodyBuilderContext {
2928
: super(libraryBuilder, declarationBuilder,
3029
isDeclarationInstanceMember: isDeclarationInstanceMember);
3130

32-
@override
33-
// Coverage-ignore(suite): Not run.
34-
AugmentSuperTarget? get augmentSuperTarget {
35-
if (_builder.isAugmentation) {
36-
return _builder.augmentSuperTarget;
37-
}
38-
return null;
39-
}
40-
4131
@override
4232
List<FormalParameterBuilder>? get formals => _declaration.formals;
4333

‎pkg/front_end/lib/src/fragment/method/body_builder_context.dart‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import '../../builder/formal_parameter_builder.dart';
1111
import '../../builder/type_builder.dart';
1212
import '../../kernel/body_builder_context.dart';
1313
import '../../source/source_library_builder.dart';
14-
import '../../source/source_member_builder.dart';
1514
import '../../type_inference/type_schema.dart';
1615
import '../fragment.dart';
1716
import 'declaration.dart';
@@ -29,15 +28,6 @@ class MethodFragmentBodyBuilderContext extends BodyBuilderContext {
2928
: super(libraryBuilder, declarationBuilder,
3029
isDeclarationInstanceMember: isDeclarationInstanceMember);
3130

32-
@override
33-
// Coverage-ignore(suite): Not run.
34-
AugmentSuperTarget? get augmentSuperTarget {
35-
if (_fragment.builder.isAugmentation) {
36-
return _fragment.builder.augmentSuperTarget;
37-
}
38-
return null;
39-
}
40-
4131
@override
4232
List<FormalParameterBuilder>? get formals => _declaration.formals;
4333

‎pkg/front_end/lib/src/fragment/setter/body_builder_context.dart‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import '../../builder/formal_parameter_builder.dart';
1111
import '../../builder/type_builder.dart';
1212
import '../../kernel/body_builder_context.dart';
1313
import '../../source/source_library_builder.dart';
14-
import '../../source/source_member_builder.dart';
1514
import '../../source/source_property_builder.dart';
1615
import '../../type_inference/type_schema.dart';
1716
import 'declaration.dart';
@@ -29,15 +28,6 @@ class SetterBodyBuilderContext extends BodyBuilderContext {
2928
: super(libraryBuilder, declarationBuilder,
3029
isDeclarationInstanceMember: isDeclarationInstanceMember);
3130

32-
@override
33-
// Coverage-ignore(suite): Not run.
34-
AugmentSuperTarget? get augmentSuperTarget {
35-
if (_builder.isAugmentation) {
36-
return _builder.augmentSuperTarget;
37-
}
38-
return null;
39-
}
40-
4131
@override
4232
List<FormalParameterBuilder>? get formals => _declaration.formals;
4333

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,6 @@ class SourceClassBuilder extends ClassBuilderImpl
130130

131131
final IndexedClass? indexedClass;
132132

133-
bool? _isConflictingAugmentationMember;
134-
135-
/// Returns `true` if this class is a class declared in an augmentation
136-
/// library that conflicts with a declaration in the origin library.
137-
bool get isConflictingAugmentationMember {
138-
return _isConflictingAugmentationMember ??= false;
139-
}
140-
141-
// Coverage-ignore(suite): Not run.
142-
void set isConflictingAugmentationMember(bool value) {
143-
assert(_isConflictingAugmentationMember == null,
144-
'$this.isConflictingAugmentationMember has already been fixed.');
145-
_isConflictingAugmentationMember = value;
146-
}
147-
148133
final ClassDeclaration _introductory;
149134
List<ClassDeclaration> _augmentations;
150135

@@ -1296,16 +1281,6 @@ class SourceClassBuilder extends ClassBuilderImpl
12961281
void _addMemberToClass(SourceMemberBuilder memberBuilder, Member member) {
12971282
member.parent = cls;
12981283
if (!memberBuilder.isDuplicate && !memberBuilder.isConflictingSetter) {
1299-
if (memberBuilder.isConflictingAugmentationMember) {
1300-
// Coverage-ignore-block(suite): Not run.
1301-
if (member is Field && member.isStatic ||
1302-
member is Procedure && member.isStatic) {
1303-
member.name = new Name('${member.name}', member.name.library);
1304-
} else {
1305-
return;
1306-
}
1307-
}
1308-
13091284
if (member is Procedure) {
13101285
cls.addProcedure(member);
13111286
} else if (member is Field) {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,6 @@ class SourceConstructorBuilderImpl extends SourceMemberBuilderImpl
316316
// Coverage-ignore(suite): Not run.
317317
Reference get invokeTargetReference => _invokeTargetReference;
318318

319-
@override
320-
// Coverage-ignore(suite): Not run.
321-
bool get isAugmentation => modifiers.isAugment;
322-
323319
@override
324320
// Coverage-ignore(suite): Not run.
325321
bool get isClassInstanceMember => false;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ class SourceFactoryBuilder extends SourceMemberBuilderImpl
102102
ConstructorReferenceBuilder? get redirectionTarget =>
103103
_lastDeclaration.redirectionTarget;
104104

105-
@override
106-
// Coverage-ignore(suite): Not run.
107-
bool get isAugmentation => modifiers.isAugment;
108-
109105
@override
110106
bool get isConst => modifiers.isConst;
111107

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -884,8 +884,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
884884
if (declaration is SourceClassBuilder) {
885885
Class cls = declaration.build(coreLibrary);
886886
if (!declaration.isAugmentation) {
887-
if (declaration.isDuplicate ||
888-
declaration.isConflictingAugmentationMember) {
887+
if (declaration.isDuplicate) {
889888
cls.name = '${cls.name}'
890889
'#${declaration.duplicateIndex}';
891890
}
@@ -962,19 +961,11 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
962961
if (member is Field) {
963962
member.isStatic = true;
964963
if (!declaration.isDuplicate) {
965-
if (declaration.isConflictingAugmentationMember) {
966-
// Coverage-ignore-block(suite): Not run.
967-
member.name = new Name('${member.name.text}', member.name.library);
968-
}
969964
library.addField(member);
970965
}
971966
} else if (member is Procedure) {
972967
member.isStatic = true;
973968
if (!declaration.isDuplicate && !declaration.isConflictingSetter) {
974-
if (declaration.isConflictingAugmentationMember) {
975-
// Coverage-ignore-block(suite): Not run.
976-
member.name = new Name('${member.name.text}', member.name.library);
977-
}
978969
library.addProcedure(member);
979970
}
980971
} else {

0 commit comments

Comments
 (0)