| Index: pkg/compiler/lib/src/resolution/type_resolver.dart
|
| diff --git a/pkg/compiler/lib/src/resolution/type_resolver.dart b/pkg/compiler/lib/src/resolution/type_resolver.dart
|
| index a4335c887e177f258154d93b6945bc9a6d85fc61..480e51a844276982717aac661f0e2455e609f2ec 100644
|
| --- a/pkg/compiler/lib/src/resolution/type_resolver.dart
|
| +++ b/pkg/compiler/lib/src/resolution/type_resolver.dart
|
| @@ -3,6 +3,9 @@
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| library dart2js.resolution.types;
|
| +
|
| +import '../common/resolution.dart' show
|
| + Resolution;
|
| import '../compiler.dart' show
|
| Compiler;
|
| import '../dart_backend/dart_backend.dart' show
|
| @@ -43,6 +46,7 @@ class TypeResolver {
|
| TypeResolver(this.compiler);
|
|
|
| DiagnosticListener get listener => compiler;
|
| + Resolution get resolution => compiler.resolution;
|
|
|
| /// Tries to resolve the type name as an element.
|
| Element resolveTypeName(Identifier prefixName,
|
| @@ -182,7 +186,7 @@ class TypeResolver {
|
| // TODO(johnniwinther): [ensureClassWillBeResolvedInternal] should imply
|
| // [computeType].
|
| compiler.resolver.ensureClassWillBeResolvedInternal(cls);
|
| - cls.computeType(compiler);
|
| + cls.computeType(resolution);
|
| List<DartType> arguments = <DartType>[];
|
| bool hasTypeArgumentMismatch = resolveTypeArguments(
|
| visitor, node, cls.typeVariables, arguments);
|
| @@ -202,8 +206,8 @@ class TypeResolver {
|
| } else if (element.isTypedef) {
|
| TypedefElement typdef = element;
|
| // TODO(johnniwinther): [ensureResolved] should imply [computeType].
|
| - typdef.ensureResolved(compiler);
|
| - typdef.computeType(compiler);
|
| + typdef.ensureResolved(resolution);
|
| + typdef.computeType(resolution);
|
| List<DartType> arguments = <DartType>[];
|
| bool hasTypeArgumentMismatch = resolveTypeArguments(
|
| visitor, node, typdef.typeVariables, arguments);
|
|
|