| Index: pkg/front_end/lib/src/fasta/builder/builder.dart
|
| diff --git a/pkg/front_end/lib/src/fasta/builder/builder.dart b/pkg/front_end/lib/src/fasta/builder/builder.dart
|
| index 5b2418bda4611934d0ed0739bf6ac0d4781ab738..f2349136dc1dcfdf5964e470a955867a8788db59 100644
|
| --- a/pkg/front_end/lib/src/fasta/builder/builder.dart
|
| +++ b/pkg/front_end/lib/src/fasta/builder/builder.dart
|
| @@ -58,6 +58,8 @@ export 'function_type_builder.dart' show FunctionTypeBuilder;
|
|
|
| import 'library_builder.dart' show LibraryBuilder;
|
|
|
| +import 'invalid_type_builder.dart' show InvalidTypeBuilder;
|
| +
|
| abstract class Builder {
|
| /// Used when multiple things with the same name are declared within the same
|
| /// parent. Only used for declarations, not for scopes.
|
| @@ -95,6 +97,7 @@ abstract class Builder {
|
| Builder combineAmbiguousImport(
|
| String name, Builder other, LibraryBuilder library) {
|
| if (other == this) return this;
|
| + if (other is InvalidTypeBuilder) return other;
|
| bool isLocal = false;
|
| Builder preferred;
|
| Builder hidden;
|
|
|