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

Unified Diff: pkg/compiler/lib/src/inferrer/builder.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
« no previous file with comments | « pkg/compiler/lib/src/compiler.dart ('k') | pkg/compiler/lib/src/inferrer/closure_tracer.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/inferrer/builder.dart
diff --git a/pkg/compiler/lib/src/inferrer/builder.dart b/pkg/compiler/lib/src/inferrer/builder.dart
index 519524c81e29f663ea84a0452cde8d48b18ece35..25f5337b33b40263ac14cffc2eef4b3e5d0f6f9d 100644
--- a/pkg/compiler/lib/src/inferrer/builder.dart
+++ b/pkg/compiler/lib/src/inferrer/builder.dart
@@ -15,8 +15,7 @@ import '../elements/resolution_types.dart'
show ResolutionDartType, ResolutionInterfaceType;
import '../elements/elements.dart';
import '../elements/entities.dart';
-import '../js_backend/backend_helpers.dart';
-import '../js_backend/js_backend.dart' as js;
+import '../js_backend/backend.dart' show JavaScriptBackend;
import '../native/native.dart' as native;
import '../resolution/operators.dart' as op;
import '../resolution/semantic_visitor.dart';
@@ -2511,9 +2510,9 @@ class ElementGraphBuilder extends ast.Visitor<TypeInformation>
TypeMask mask = inTreeData.typeOfSend(node);
String name = element.name;
handleStaticSend(node, selector, mask, element, arguments);
- if (name == BackendHelpers.JS ||
- name == BackendHelpers.JS_EMBEDDED_GLOBAL ||
- name == BackendHelpers.JS_BUILTIN) {
+ if (name == JavaScriptBackend.JS ||
+ name == JavaScriptBackend.JS_EMBEDDED_GLOBAL ||
+ name == JavaScriptBackend.JS_BUILTIN) {
native.NativeBehavior nativeBehavior = elements.getNativeData(node);
sideEffects.add(nativeBehavior.sideEffects);
return inferrer.typeOfNativeBehavior(nativeBehavior);
@@ -2920,8 +2919,7 @@ class ElementGraphBuilder extends ast.Visitor<TypeInformation>
Selector moveNextSelector = Selectors.moveNext;
TypeMask moveNextMask = inTreeData.typeOfIteratorMoveNext(node);
- js.JavaScriptBackend backend = compiler.backend;
- ConstructorElement ctor = backend.helpers.streamIteratorConstructor;
+ ConstructorElement ctor = compiler.commonElements.streamIteratorConstructor;
/// Synthesize a call to the [StreamIterator] constructor.
TypeInformation iteratorType = handleStaticSend(
« no previous file with comments | « pkg/compiler/lib/src/compiler.dart ('k') | pkg/compiler/lib/src/inferrer/closure_tracer.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698