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

Unified Diff: pkg/compiler/lib/src/kernel/world_builder.dart

Issue 2814453005: Merge CommonElements and BackendHelpers! (Closed)
Patch Set: merge with head 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/kernel/world_builder.dart
diff --git a/pkg/compiler/lib/src/kernel/world_builder.dart b/pkg/compiler/lib/src/kernel/world_builder.dart
index 7713ae1c0b15a3ea1d169262648281156359850c..b4c53d7fc805201ca6f21b5d3d6c22234bc4c461 100644
--- a/pkg/compiler/lib/src/kernel/world_builder.dart
+++ b/pkg/compiler/lib/src/kernel/world_builder.dart
@@ -18,7 +18,6 @@ import '../common_elements.dart';
import '../elements/elements.dart';
import '../elements/entities.dart';
import '../elements/types.dart';
-import '../js_backend/backend_helpers.dart';
import '../js_backend/constant_system_javascript.dart';
import '../js_backend/no_such_method_registry.dart';
import '../native/native.dart' as native;
@@ -76,10 +75,10 @@ class KernelWorldBuilder extends KernelElementAdapterMixin {
KernelWorldBuilder(this.reporter, ir.Program program)
: _env = new KEnv(program) {
_elementEnvironment = new KernelElementEnvironment(this);
- _commonElements = new CommonElementsImpl(_elementEnvironment);
+ _commonElements = new CommonElements(_elementEnvironment);
ConstantEnvironment constants = new KernelConstantEnvironment(this);
_nativeBehaviorBuilder =
- new KernelBehaviorBuilder(_commonElements, helpers, constants);
+ new KernelBehaviorBuilder(_commonElements, constants);
_typeConverter = new DartTypeConverter(this);
}
@@ -750,10 +749,9 @@ class DartTypeConverter extends ir.DartTypeVisitor<DartType> {
/// [native.BehaviorBuilder] for kernel based elements.
class KernelBehaviorBuilder extends native.BehaviorBuilder {
final CommonElements commonElements;
- final BackendHelpers helpers;
final ConstantEnvironment constants;
- KernelBehaviorBuilder(this.commonElements, this.helpers, this.constants);
+ KernelBehaviorBuilder(this.commonElements, this.constants);
@override
bool get trustJSInteropTypeAnnotations {

Powered by Google App Engine
This is Rietveld 408576698