| Index: pkg/compiler/lib/src/js_model/js_strategy.dart
|
| diff --git a/pkg/compiler/lib/src/js_model/js_strategy.dart b/pkg/compiler/lib/src/js_model/js_strategy.dart
|
| index cb118b74a483f96cf81c44424089c1774892bb2b..a526ba4c9f65599bfb7066fc4cd702b79d22cfd5 100644
|
| --- a/pkg/compiler/lib/src/js_model/js_strategy.dart
|
| +++ b/pkg/compiler/lib/src/js_model/js_strategy.dart
|
| @@ -413,6 +413,7 @@ class JsClosedWorld extends ClosedWorldBase with KernelClosedWorldMixin {
|
| MemberEntity member,
|
| ir.FunctionNode originalClosureFunctionNode,
|
| JLibrary enclosingLibrary,
|
| + Set<JsCapturedScope> capturedScopes,
|
| KernelScopeInfo info,
|
| ir.Location location,
|
| KernelToLocalsMap localsMap) {
|
| @@ -422,6 +423,7 @@ class JsClosedWorld extends ClosedWorldBase with KernelClosedWorldMixin {
|
| member,
|
| originalClosureFunctionNode,
|
| enclosingLibrary,
|
| + capturedScopes,
|
| info,
|
| location,
|
| localsMap,
|
| @@ -431,15 +433,15 @@ class JsClosedWorld extends ClosedWorldBase with KernelClosedWorldMixin {
|
| // .getSupertypes(class)
|
| ClassHierarchyNode parentNode = getClassHierarchyNode(superclass);
|
| ClassHierarchyNode node = new ClassHierarchyNode(
|
| - parentNode, cls, getHierarchyDepth(superclass) + 1);
|
| - addClassHierarchyNode(cls, node);
|
| + parentNode, cls.closureClassEntity, getHierarchyDepth(superclass) + 1);
|
| + addClassHierarchyNode(cls.closureClassEntity, node);
|
| for (InterfaceType type in getOrderedTypeSet(superclass).types) {
|
| // TODO(efortuna): assert that the FunctionClass is in this ordered set.
|
| // If not, we need to explicitly add node as a subtype of FunctionClass.
|
| ClassSet subtypeSet = getClassSet(type.element);
|
| subtypeSet.addSubtype(node);
|
| }
|
| - addClassSet(cls, new ClassSet(node));
|
| + addClassSet(cls.closureClassEntity, new ClassSet(node));
|
| node.isDirectlyInstantiated = true;
|
|
|
| return cls;
|
|
|