Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(876)

Unified Diff: pkg/front_end/lib/src/fasta/kernel/kernel_function_type_alias_builder.dart

Issue 2729943003: Recover from bad supertypes. (Closed)
Patch Set: Update status files. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/front_end/lib/src/fasta/kernel/kernel_function_type_alias_builder.dart
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_function_type_alias_builder.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_function_type_alias_builder.dart
index 63e2010624120749ef91ac111032f07e1ae01a91..70e0205dabbc0b7710cdaa374818bba1047a8ded 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_function_type_alias_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_function_type_alias_builder.dart
@@ -46,7 +46,7 @@ class KernelFunctionTypeAliasBuilder
: super(metadata, returnType, name, typeVariables, formals, parent,
charOffset);
- DartType buildThisType() {
+ DartType buildThisType(LibraryBuilder library) {
if (thisType != null) {
if (thisType == const InvalidType()) {
thisType = const DynamicType();
@@ -57,13 +57,14 @@ class KernelFunctionTypeAliasBuilder
return thisType;
}
thisType = const InvalidType();
- DartType returnType = this.returnType?.build() ?? const DynamicType();
+ DartType returnType =
+ this.returnType?.build(library) ?? const DynamicType();
List<DartType> positionalParameters = <DartType>[];
List<NamedType> namedParameters;
int requiredParameterCount = 0;
if (formals != null) {
for (KernelFormalParameterBuilder formal in formals) {
- DartType type = formal.type?.build() ?? const DynamicType();
+ DartType type = formal.type?.build(library) ?? const DynamicType();
if (formal.isPositional) {
positionalParameters.add(type);
if (formal.isRequired) requiredParameterCount++;
@@ -90,8 +91,9 @@ class KernelFunctionTypeAliasBuilder
}
/// [arguments] have already been built.
- DartType buildTypesWithBuiltArguments(List<DartType> arguments) {
- var thisType = buildThisType();
+ DartType buildTypesWithBuiltArguments(
+ LibraryBuilder library, List<DartType> arguments) {
+ var thisType = buildThisType(library);
if (thisType is DynamicType) return thisType;
FunctionType result = thisType;
if (result.typeParameters.isEmpty && arguments == null) return result;
@@ -103,8 +105,9 @@ class KernelFunctionTypeAliasBuilder
return substitute(result.withoutTypeParameters, substitution);
}
- DartType buildType(List<KernelTypeBuilder> arguments) {
- var thisType = buildThisType();
+ DartType buildType(
+ LibraryBuilder library, List<KernelTypeBuilder> arguments) {
+ var thisType = buildThisType(library);
if (thisType is DynamicType) return thisType;
FunctionType result = thisType;
if (result.typeParameters.isEmpty && arguments == null) return result;
@@ -112,9 +115,9 @@ class KernelFunctionTypeAliasBuilder
List<DartType> builtArguments = <DartType>[];
if (arguments != null) {
for (int i = 0; i < arguments.length; i++) {
- builtArguments.add(arguments[i].build());
+ builtArguments.add(arguments[i].build(library));
}
}
- return buildTypesWithBuiltArguments(builtArguments);
+ return buildTypesWithBuiltArguments(library, builtArguments);
}
}

Powered by Google App Engine
This is Rietveld 408576698