Skip to content

Commit 1baa8ca

Browse files
jensjohaCommit Queue
authored andcommitted
[CFE] Bypass weird extensionTypeDeclarationBuilder -> parent -> declarationBuilder dance
Change-Id: Ib69420558288963cc6bcbc0fb449ab5ac3f72c18 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398380 Reviewed-by: Johnni Winther <[email protected]> Commit-Queue: Jens Johansen <[email protected]>
1 parent 17483c5 commit 1baa8ca

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,9 +1296,6 @@ class SourceExtensionTypeConstructorBuilder
12961296
// Coverage-ignore(suite): Not run.
12971297
Name get memberName => _memberName.name;
12981298

1299-
SourceExtensionTypeDeclarationBuilder get extensionTypeDeclarationBuilder =>
1300-
parent as SourceExtensionTypeDeclarationBuilder;
1301-
13021299
@override
13031300
Member get readTarget =>
13041301
_constructorTearOff ?? // Coverage-ignore(suite): Not run.
@@ -1346,7 +1343,7 @@ class SourceExtensionTypeConstructorBuilder
13461343
// For modular compilation purposes we need to include initializers
13471344
// for const constructors into the outline.
13481345
LookupScope typeParameterScope =
1349-
computeTypeParameterScope(extensionTypeDeclarationBuilder.scope);
1346+
computeTypeParameterScope(declarationBuilder.scope);
13501347
_buildConstructorForOutline(beginInitializers, typeParameterScope);
13511348
_buildBody();
13521349
}
@@ -1405,7 +1402,7 @@ class SourceExtensionTypeConstructorBuilder
14051402
// function is its enclosing class.
14061403
super.buildFunction();
14071404
ExtensionTypeDeclaration extensionTypeDeclaration =
1408-
extensionTypeDeclarationBuilder.extensionTypeDeclaration;
1405+
declarationBuilder.extensionTypeDeclaration;
14091406
List<DartType> typeParameterTypes = <DartType>[];
14101407
for (int i = 0; i < function.typeParameters.length; i++) {
14111408
TypeParameter typeParameter = function.typeParameters[i];
@@ -1494,13 +1491,12 @@ class SourceExtensionTypeConstructorBuilder
14941491

14951492
Substitution get _substitution {
14961493
if (typeParameters != null) {
1497-
assert(extensionTypeDeclarationBuilder.typeParameters!.length ==
1498-
typeParameters?.length);
1494+
assert(
1495+
declarationBuilder.typeParameters!.length == typeParameters?.length);
14991496
_substitutionCache = Substitution.fromPairs(
1500-
extensionTypeDeclarationBuilder
1501-
.extensionTypeDeclaration.typeParameters,
1497+
declarationBuilder.extensionTypeDeclaration.typeParameters,
15021498
new List<DartType>.generate(
1503-
extensionTypeDeclarationBuilder.typeParameters!.length,
1499+
declarationBuilder.typeParameters!.length,
15041500
(int index) =>
15051501
new TypeParameterType.withDefaultNullabilityForLibrary(
15061502
function.typeParameters[index],

0 commit comments

Comments
 (0)