| 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 ae711e06405787400c276287c898e9028430f077..9a882f1ef83fa8d446a1ba7d2c7c35611072b69e 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart
|
| @@ -5,11 +5,7 @@
|
| library dart2js.js_emitter.runtime_type_generator;
|
|
|
| import '../closure.dart'
|
| - show
|
| - ClosureRepresentationInfo,
|
| - ClosureFieldElement,
|
| - ClosureConversionTask,
|
| - ScopeInfo;
|
| + show ClosureRepresentationInfo, ClosureFieldElement, ClosureConversionTask;
|
| import '../common.dart';
|
| import '../common/names.dart' show Identifiers;
|
| import '../common_elements.dart' show CommonElements, ElementEnvironment;
|
| @@ -178,9 +174,10 @@ class RuntimeTypeGenerator {
|
| assert(!(method is MethodElement && !method.isImplementation));
|
| jsAst.Expression thisAccess = new jsAst.This();
|
| if (!method.isAbstract) {
|
| - ScopeInfo scopeInfo = _closureDataLookup.getScopeInfo(method);
|
| - if (scopeInfo is ClosureRepresentationInfo) {
|
| - ClosureFieldElement thisLocal = scopeInfo.thisFieldEntity;
|
| + ClosureRepresentationInfo closureData =
|
| + _closureDataLookup.getClosureInfoForMember(method);
|
| + if (closureData != null) {
|
| + ClosureFieldElement thisLocal = closureData.thisFieldEntity;
|
| if (thisLocal != null) {
|
| jsAst.Name thisName = _namer.instanceFieldPropertyName(thisLocal);
|
| thisAccess = js('this.#', thisName);
|
|
|