Index: pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart |
diff --git a/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart b/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart |
index ef47eff3ccc9d9da4fdd298dc468fdf03edee393..a232fc5aceda3e0e6f236c0d6a8068fba08a983e 100644 |
--- a/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart |
+++ b/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart |
@@ -4,7 +4,8 @@ |
library dart2js.js_emitter.runtime_type_generator; |
-import '../closure.dart' show ClosureClassMap, ClosureFieldElement, ClosureTask; |
+import '../closure.dart' |
+ show ClosureRepresentationInfo, ClosureFieldElement, ClosureTask; |
import '../common.dart'; |
import '../common/names.dart' show Identifiers; |
import '../common_elements.dart' show CommonElements; |
@@ -124,11 +125,10 @@ class RuntimeTypeGenerator { |
assert(method.isImplementation); |
jsAst.Expression thisAccess = new jsAst.This(); |
if (!method.isAbstract) { |
- ClosureClassMap closureData = |
- _closureToClassMapper.getClosureToClassMapping(method); |
+ ClosureRepresentationInfo closureData = |
+ _closureToClassMapper.getClosureRepresentationInfo(method); |
if (closureData != null) { |
- ClosureFieldElement thisLocal = |
- closureData.freeVariableMap[closureData.thisLocal]; |
+ ClosureFieldElement thisLocal = closureData.thisFieldEntity; |
if (thisLocal != null) { |
jsAst.Name thisName = _namer.instanceFieldPropertyName(thisLocal); |
thisAccess = js('this.#', thisName); |