Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: pkg/compiler/lib/src/js_model/js_strategy.dart

Issue 2994353002: Fix the locals lookup of variables and partial implementation of boxing of variables.
Patch Set: Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/compiler/lib/src/js_model/elements.dart ('k') | pkg/compiler/lib/src/js_model/locals.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « pkg/compiler/lib/src/js_model/elements.dart ('k') | pkg/compiler/lib/src/js_model/locals.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698