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

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

Issue 3011433002: Revert "Reduce use of getClosureInfoForMember and cleanup closure_test" (Closed)
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
Index: pkg/compiler/lib/src/js_model/closure.dart
diff --git a/pkg/compiler/lib/src/js_model/closure.dart b/pkg/compiler/lib/src/js_model/closure.dart
index 06d8f2141aa62ad3a82d4fef59eec74e6dd611da..e35f4c6e85e3fa900c5f7bb02d142224f4190d08 100644
--- a/pkg/compiler/lib/src/js_model/closure.dart
+++ b/pkg/compiler/lib/src/js_model/closure.dart
@@ -165,10 +165,7 @@ class KernelClosureConversionTask extends ClosureConversionTask<ir.Node> {
entity = constructorBody.constructor;
}
- ScopeInfo scopeInfo = _scopeMap[entity];
- assert(
- scopeInfo != null, failedAt(entity, "Missing scope info for $entity."));
- return scopeInfo;
+ return _scopeMap[entity] ?? getClosureInfoForMember(entity);
}
// TODO(efortuna): Eventually capturedScopesMap[node] should always
@@ -212,6 +209,17 @@ class KernelClosureConversionTask extends ClosureConversionTask<ir.Node> {
"Closures found for ${_localClosureRepresentationMap.keys}");
return closure;
}
+
+ @override
+ ClosureRepresentationInfo getClosureInfoForMemberTesting(
+ MemberEntity entity) {
+ return _memberClosureRepresentationMap[entity];
+ }
+
+ @override
+ ClosureRepresentationInfo getClosureInfoForTesting(ir.Node node) {
+ return _localClosureRepresentationMap[node];
+ }
}
class KernelScopeInfo {
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart ('k') | pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698