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

Unified Diff: pkg/compiler/lib/src/ssa/kernel_ast_adapter.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
« no previous file with comments | « pkg/compiler/lib/src/js_model/closure.dart ('k') | tests/compiler/dart2js/closure/closure_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
diff --git a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
index bda22d2add56cd5027966f9c57c3be6301433cd1..7f3458d79edb90b1dee5239f95575844aa711c3f 100644
--- a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
+++ b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
@@ -133,8 +133,13 @@ class KernelAstAdapter extends KernelToElementMapBaseMixin
target = kernel.functions[originTarget];
// Closures require a lookup one level deeper in the closure class mapper.
if (target == null) {
- SynthesizedCallMethodElementX originTargetFunction = originTarget;
- target = kernel.localFunctions[originTargetFunction.expression];
+ MethodElement originTargetFunction = originTarget;
+ ClosureRepresentationInfo classMap = _compiler
+ .backendStrategy.closureDataLookup
+ .getClosureInfoForMember(originTargetFunction);
+ if (classMap.closureEntity != null) {
+ target = kernel.localFunctions[classMap.closureEntity];
+ }
}
} else if (originTarget is FieldElement) {
target = kernel.fields[originTarget];
« no previous file with comments | « pkg/compiler/lib/src/js_model/closure.dart ('k') | tests/compiler/dart2js/closure/closure_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698