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

Unified Diff: pkg/compiler/lib/src/world.dart

Issue 2814453005: Merge CommonElements and BackendHelpers! (Closed)
Patch Set: comments and re-merge, take two Created 3 years, 8 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/world.dart
diff --git a/pkg/compiler/lib/src/world.dart b/pkg/compiler/lib/src/world.dart
index 065a5663d935a60bdc74d7c52d6d327ad0929c1b..c01141fa6a6bbb2fadd0ecb34fc82321db39d027 100644
--- a/pkg/compiler/lib/src/world.dart
+++ b/pkg/compiler/lib/src/world.dart
@@ -717,7 +717,7 @@ class ClosedWorldImpl implements ClosedWorld, ClosedWorldRefiner {
ClassElement getLubOfInstantiatedSubclasses(ClassElement cls) {
assert(isClosed);
if (nativeData.isJsInteropClass(cls)) {
- return _backend.helpers.jsJavaScriptObjectClass;
+ return commonElements.jsJavaScriptObjectClass;
}
ClassHierarchyNode hierarchy = _classHierarchyNodes[cls.declaration];
return hierarchy != null
@@ -729,7 +729,7 @@ class ClosedWorldImpl implements ClosedWorld, ClosedWorldRefiner {
ClassElement getLubOfInstantiatedSubtypes(ClassElement cls) {
assert(isClosed);
if (nativeData.isJsInteropClass(cls)) {
- return _backend.helpers.jsJavaScriptObjectClass;
+ return commonElements.jsJavaScriptObjectClass;
}
ClassSet classSet = _classSets[cls.declaration];
return classSet != null ? classSet.getLubOfInstantiatedSubtypes() : null;
« no previous file with comments | « pkg/compiler/lib/src/ssa/value_range_analyzer.dart ('k') | tests/compiler/dart2js/jsinterop/world_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698