Skip to content

Commit b117e10

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Remove InterfaceFragmentImpl.instantiateImpl()
Change-Id: I245cb954a12fa7c777855066423b83a1d6008586 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431681 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 5af6310 commit b117e10

File tree

7 files changed

+26
-61
lines changed

7 files changed

+26
-61
lines changed

‎pkg/analyzer/lib/src/dart/element/element.dart‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5108,7 +5108,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
51085108
} else {
51095109
typeArguments = const [];
51105110
}
5111-
return _thisType = firstFragment.instantiateImpl(
5111+
return _thisType = instantiateImpl(
51125112
typeArguments: typeArguments,
51135113
nullabilitySuffix: NullabilitySuffix.none,
51145114
);
@@ -5477,16 +5477,6 @@ abstract class InterfaceFragmentImpl extends InstanceFragmentImpl
54775477
_supertype = value as InterfaceTypeImpl?;
54785478
}
54795479

5480-
InterfaceTypeImpl instantiateImpl({
5481-
required List<TypeImpl> typeArguments,
5482-
required NullabilitySuffix nullabilitySuffix,
5483-
}) {
5484-
return element.instantiateImpl(
5485-
typeArguments: typeArguments,
5486-
nullabilitySuffix: nullabilitySuffix,
5487-
);
5488-
}
5489-
54905480
/// Builds constructors for this mixin application.
54915481
void _buildMixinAppConstructors() {}
54925482

‎pkg/analyzer/lib/src/summary2/bundle_reader.dart‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2076,24 +2076,23 @@ class ResolutionReader {
20762076
var type = _readFunctionType();
20772077
return _readAliasElementArguments(type);
20782078
} else if (tag == Tag.InterfaceType) {
2079-
var element = readElement() as InterfaceFragmentImpl;
2079+
var element = readElement2() as InterfaceElementImpl2;
20802080
var typeArguments = _readTypeList();
20812081
var nullability = _readNullability();
2082-
var type = InterfaceTypeImpl(
2083-
element: element.asElement2,
2082+
var type = element.instantiateImpl(
20842083
typeArguments: typeArguments,
20852084
nullabilitySuffix: nullability,
20862085
);
20872086
return _readAliasElementArguments(type);
20882087
} else if (tag == Tag.InterfaceType_noTypeArguments_none) {
2089-
var element = readElement() as InterfaceFragmentImpl;
2088+
var element = readElement2() as InterfaceElementImpl2;
20902089
var type = element.instantiateImpl(
20912090
typeArguments: const [],
20922091
nullabilitySuffix: NullabilitySuffix.none,
20932092
);
20942093
return _readAliasElementArguments(type);
20952094
} else if (tag == Tag.InterfaceType_noTypeArguments_question) {
2096-
var element = readElement() as InterfaceFragmentImpl;
2095+
var element = readElement2() as InterfaceElementImpl2;
20972096
var type = element.instantiateImpl(
20982097
typeArguments: const [],
20992098
nullabilitySuffix: NullabilitySuffix.question,
@@ -2110,12 +2109,9 @@ class ResolutionReader {
21102109
var type = _readRecordType();
21112110
return _readAliasElementArguments(type);
21122111
} else if (tag == Tag.TypeParameterType) {
2113-
var element = readElement() as TypeParameterFragmentImpl;
2112+
var element = readElement2() as TypeParameterElementImpl2;
21142113
var nullability = _readNullability();
2115-
var type = TypeParameterTypeImpl(
2116-
element3: element.asElement2,
2117-
nullabilitySuffix: nullability,
2118-
);
2114+
var type = element.instantiate(nullabilitySuffix: nullability);
21192115
return _readAliasElementArguments(type);
21202116
} else if (tag == Tag.VoidType) {
21212117
var type = VoidTypeImpl.instance;

‎pkg/analyzer/test/generated/elements_types_mixin.dart‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mixin ElementsTypesMixin {
2727

2828
InterfaceTypeImpl get boolQuestion {
2929
var element = typeProvider.boolElement2;
30-
return interfaceTypeQuestion2(element);
30+
return interfaceTypeQuestion(element);
3131
}
3232

3333
InterfaceTypeImpl get doubleNone {
@@ -37,7 +37,7 @@ mixin ElementsTypesMixin {
3737

3838
InterfaceTypeImpl get doubleQuestion {
3939
var element = typeProvider.doubleElement2;
40-
return interfaceTypeQuestion2(element);
40+
return interfaceTypeQuestion(element);
4141
}
4242

4343
TypeImpl get dynamicType => DynamicTypeImpl.instance;
@@ -49,7 +49,7 @@ mixin ElementsTypesMixin {
4949

5050
InterfaceTypeImpl get functionQuestion {
5151
var element = typeProvider.functionElement2;
52-
return interfaceTypeQuestion2(element);
52+
return interfaceTypeQuestion(element);
5353
}
5454

5555
InterfaceTypeImpl get intNone {
@@ -59,7 +59,7 @@ mixin ElementsTypesMixin {
5959

6060
InterfaceTypeImpl get intQuestion {
6161
var element = typeProvider.intElement2;
62-
return interfaceTypeQuestion2(element);
62+
return interfaceTypeQuestion(element);
6363
}
6464

6565
TypeImpl get invalidType => InvalidTypeImpl.instance;
@@ -80,7 +80,7 @@ mixin ElementsTypesMixin {
8080

8181
InterfaceTypeImpl get numQuestion {
8282
var element = typeProvider.numElement2;
83-
return interfaceTypeQuestion2(element);
83+
return interfaceTypeQuestion(element);
8484
}
8585

8686
InterfaceTypeImpl get objectNone {
@@ -90,7 +90,7 @@ mixin ElementsTypesMixin {
9090

9191
InterfaceTypeImpl get objectQuestion {
9292
var element = typeProvider.objectElement2;
93-
return interfaceTypeQuestion2(element);
93+
return interfaceTypeQuestion(element);
9494
}
9595

9696
InterfaceTypeImpl get recordNone {
@@ -105,7 +105,7 @@ mixin ElementsTypesMixin {
105105

106106
InterfaceTypeImpl get stringQuestion {
107107
var element = typeProvider.stringElement2;
108-
return interfaceTypeQuestion2(element);
108+
return interfaceTypeQuestion(element);
109109
}
110110

111111
LibraryElementImpl get testLibrary => throw UnimplementedError();
@@ -345,17 +345,6 @@ mixin ElementsTypesMixin {
345345
);
346346
}
347347

348-
InterfaceTypeImpl interfaceType(
349-
InterfaceFragmentImpl element, {
350-
List<TypeImpl> typeArguments = const [],
351-
required NullabilitySuffix nullabilitySuffix,
352-
}) {
353-
return element.instantiateImpl(
354-
typeArguments: typeArguments,
355-
nullabilitySuffix: nullabilitySuffix,
356-
);
357-
}
358-
359348
InterfaceTypeImpl interfaceTypeNone(
360349
InterfaceElementImpl2 element, {
361350
List<TypeImpl> typeArguments = const [],
@@ -367,16 +356,6 @@ mixin ElementsTypesMixin {
367356
}
368357

369358
InterfaceTypeImpl interfaceTypeQuestion(
370-
InterfaceFragmentImpl element, {
371-
List<TypeImpl> typeArguments = const [],
372-
}) {
373-
return element.instantiateImpl(
374-
typeArguments: typeArguments,
375-
nullabilitySuffix: NullabilitySuffix.question,
376-
);
377-
}
378-
379-
InterfaceTypeImpl interfaceTypeQuestion2(
380359
InterfaceElementImpl2 element, {
381360
List<TypeImpl> typeArguments = const [],
382361
}) {

‎pkg/analyzer/test/src/dart/element/always_exhaustive_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ class IsAlwaysExhaustiveTest extends AbstractTypeSystemTest {
4141
test_class_sealed() {
4242
var A = class_2(name: 'A', isSealed: true);
4343
isAlwaysExhaustive(interfaceTypeNone(A));
44-
isAlwaysExhaustive(interfaceTypeQuestion2(A));
44+
isAlwaysExhaustive(interfaceTypeQuestion(A));
4545
}
4646

4747
test_enum() {
4848
var E = enum_2(name: 'E', constants: []);
4949
isAlwaysExhaustive(interfaceTypeNone(E));
50-
isAlwaysExhaustive(interfaceTypeQuestion2(E));
50+
isAlwaysExhaustive(interfaceTypeQuestion(E));
5151
}
5252

5353
test_extensionType() {

‎pkg/analyzer/test/src/dart/element/flatten_type_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class FutureTypeTest extends AbstractTypeSystemTest {
134134
var A = class_2(name: 'A', interfaces: [futureNone(intNone)]);
135135

136136
_check(interfaceTypeNone(A), 'Future<int>');
137-
_check(interfaceTypeQuestion2(A), null);
137+
_check(interfaceTypeQuestion(A), null);
138138
}
139139

140140
test_interfaceType() {

‎pkg/analyzer/test/src/dart/element/nullable_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class IsNullableTest extends AbstractTypeSystemTest {
180180
);
181181

182182
isNullable(
183-
interfaceTypeQuestion2(
183+
interfaceTypeQuestion(
184184
extensionType2('A', representationType: intNone, interfaces: [intNone]),
185185
),
186186
);
@@ -317,7 +317,7 @@ class IsPotentiallyNullableTest extends AbstractTypeSystemTest {
317317

318318
test_interface_extensionType2() {
319319
isPotentiallyNullable(
320-
interfaceTypeQuestion2(extensionType2('A', representationType: intNone)),
320+
interfaceTypeQuestion(extensionType2('A', representationType: intNone)),
321321
);
322322

323323
isPotentiallyNullable(

‎pkg/analyzer/test/src/dart/element/upper_lower_bound_test.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,12 +1783,12 @@ class UpperBound_InterfaceTypes_Test extends _BoundsTestBase {
17831783

17841784
void test_directSuperclass_nullability() {
17851785
var aElement = class_2(name: 'A');
1786-
var aQuestion = interfaceTypeQuestion2(aElement);
1786+
var aQuestion = interfaceTypeQuestion(aElement);
17871787
var aNone = interfaceTypeNone(aElement);
17881788

17891789
var bElementNone = class_2(name: 'B', superType: aNone);
17901790

1791-
var bNoneQuestion = interfaceTypeQuestion2(bElementNone);
1791+
var bNoneQuestion = interfaceTypeQuestion(bElementNone);
17921792

17931793
var bNoneNone = interfaceTypeNone(bElementNone);
17941794

@@ -1842,7 +1842,7 @@ class UpperBound_InterfaceTypes_Test extends _BoundsTestBase {
18421842
void test_sameElement_nullability() {
18431843
var aElement = class_2(name: 'A');
18441844

1845-
var aQuestion = interfaceTypeQuestion2(aElement);
1845+
var aQuestion = interfaceTypeQuestion(aElement);
18461846
var aNone = interfaceTypeNone(aElement);
18471847

18481848
void assertLUB(TypeImpl type1, TypeImpl type2, TypeImpl expected) {
@@ -1943,16 +1943,16 @@ class UpperBound_InterfaceTypes_Test extends _BoundsTestBase {
19431943

19441944
void test_sharedSuperclass1_nullability() {
19451945
var aElement = class_2(name: 'A');
1946-
var aQuestion = interfaceTypeQuestion2(aElement);
1946+
var aQuestion = interfaceTypeQuestion(aElement);
19471947
var aNone = interfaceTypeNone(aElement);
19481948

19491949
var bElementNone = class_2(name: 'B', superType: aNone);
19501950
var cElementNone = class_2(name: 'C', superType: aNone);
19511951

1952-
var bNoneQuestion = interfaceTypeQuestion2(bElementNone);
1952+
var bNoneQuestion = interfaceTypeQuestion(bElementNone);
19531953
var bNoneNone = interfaceTypeNone(bElementNone);
19541954

1955-
var cNoneQuestion = interfaceTypeQuestion2(cElementNone);
1955+
var cNoneQuestion = interfaceTypeQuestion(cElementNone);
19561956
var cNoneNone = interfaceTypeNone(cElementNone);
19571957

19581958
void assertLUB(TypeImpl type1, TypeImpl type2, TypeImpl expected) {
@@ -2853,7 +2853,7 @@ class UpperBoundTest extends _BoundsTestBase {
28532853
var C = class_2(name: 'C', typeParameters: [X]);
28542854
var Y = typeParameter('Y');
28552855
var Y_none = typeParameterTypeNone(Y);
2856-
Y.bound = interfaceTypeQuestion2(C, typeArguments: [Y_none]);
2856+
Y.bound = interfaceTypeQuestion(C, typeArguments: [Y_none]);
28572857
var C_Y_none = interfaceTypeNone(C, typeArguments: [Y_none]);
28582858
var Y_none_promoted = typeParameterTypeNone(Y, promotedBound: C_Y_none);
28592859
var C_Never_none = interfaceTypeNone(C, typeArguments: [neverNone]);

0 commit comments

Comments
 (0)