Index: pkg/compiler/lib/src/typechecker.dart |
diff --git a/pkg/compiler/lib/src/typechecker.dart b/pkg/compiler/lib/src/typechecker.dart |
index 88962b2db1c4e59cd57e0eeb7885c8e0dc71c395..a4478e7bf384d9be3ab9f67e30c5d66ba1e76433 100644 |
--- a/pkg/compiler/lib/src/typechecker.dart |
+++ b/pkg/compiler/lib/src/typechecker.dart |
@@ -110,7 +110,8 @@ abstract class ElementAccess { |
return false; |
} |
} |
- ResolutionInterfaceType functionType = compiler.commonElements.functionType; |
+ ResolutionInterfaceType functionType = |
+ compiler.resolution.commonElements.functionType; |
return compiler.types |
.isAssignable(computeType(compiler.resolution), functionType); |
} |
@@ -299,7 +300,7 @@ class TypeCheckerVisitor extends Visitor<ResolutionDartType> { |
/// The immediately enclosing field, method or constructor being analyzed. |
ExecutableElement executableContext; |
- CommonElements get commonElements => compiler.commonElements; |
+ CommonElements get commonElements => resolution.commonElements; |
DiagnosticReporter get reporter => compiler.reporter; |