| Index: pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
|
| diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
|
| index 4e7db482776d8a7cc4fe9680529eb45e1f4414ed..b55873076e3f96fd2320912974d33c232848f3b4 100644
|
| --- a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
|
| +++ b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
|
| @@ -520,7 +520,7 @@ abstract class TypeInferrerImpl extends TypeInferrer {
|
|
|
| /// Gets the initializer for the given [field], or `null` if there is no
|
| /// initializer.
|
| - Expression getFieldInitializer(KernelField field);
|
| + Expression getFieldInitializer(ShadowField field);
|
|
|
| DartType getSetterType(Member interfaceMember, DartType receiverType) {
|
| if (receiverType is InterfaceType) {
|
| @@ -599,7 +599,7 @@ abstract class TypeInferrerImpl extends TypeInferrer {
|
| /// Derived classes should provide an implementation that calls
|
| /// [inferExpression] for the given [field]'s initializer expression.
|
| DartType inferFieldTopLevel(
|
| - KernelField field, DartType type, bool typeNeeded);
|
| + ShadowField field, DartType type, bool typeNeeded);
|
|
|
| @override
|
| void inferFunctionBody(
|
| @@ -774,8 +774,8 @@ abstract class TypeInferrerImpl extends TypeInferrer {
|
| // Otherwise, if `Qi` is not `_`, let `Ri` be the greatest closure of
|
| // `Qi[T/S]` with respect to `?`. Otherwise, let `Ri` be `dynamic`.
|
| for (int i = 0; i < formals.length; i++) {
|
| - KernelVariableDeclaration formal = formals[i];
|
| - if (KernelVariableDeclaration.isImplicitlyTyped(formal)) {
|
| + ShadowVariableDeclaration formal = formals[i];
|
| + if (ShadowVariableDeclaration.isImplicitlyTyped(formal)) {
|
| DartType inferredType;
|
| if (formalTypesFromContext[i] != null) {
|
| inferredType = greatestClosure(coreTypes,
|
| @@ -974,8 +974,8 @@ abstract class TypeInferrerImpl extends TypeInferrer {
|
| interfaceMember.kind == ProcedureKind.Getter) ||
|
| interfaceMember is Field)) {
|
| if (TypeInferenceEngineImpl.fullTopLevelInference) {
|
| - if (interfaceMember is KernelField) {
|
| - var accessorNode = KernelMember.getAccessorNode(interfaceMember);
|
| + if (interfaceMember is ShadowField) {
|
| + var accessorNode = ShadowMember.getAccessorNode(interfaceMember);
|
| if (accessorNode != null) {
|
| engine.inferAccessorFused(accessorNode, this.accessorNode);
|
| }
|
| @@ -1134,6 +1134,6 @@ abstract class TypeInferrerImpl extends TypeInferrer {
|
| /// so this method will no longer be needed. TODO(paulberry): remove this
|
| /// when it's appropriate to do so.
|
| bool _isFormalSemiSafe(VariableDeclaration formal) {
|
| - return formal is KernelVariableDeclaration && formal.isSemiSafe;
|
| + return formal is ShadowVariableDeclaration && formal.isSemiSafe;
|
| }
|
| }
|
|
|