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

Unified Diff: pkg/compiler/lib/src/js_backend/checked_mode_helpers.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/js_backend/checked_mode_helpers.dart
diff --git a/pkg/compiler/lib/src/js_backend/checked_mode_helpers.dart b/pkg/compiler/lib/src/js_backend/checked_mode_helpers.dart
index 9f884bae67447852c8e6e7af5f72045f4769abfd..571e10616765ff66da36876abf45b119b94b7f91 100644
--- a/pkg/compiler/lib/src/js_backend/checked_mode_helpers.dart
+++ b/pkg/compiler/lib/src/js_backend/checked_mode_helpers.dart
@@ -14,7 +14,6 @@ import '../ssa/codegen.dart' show SsaCodeGenerator;
import '../ssa/nodes.dart' show HTypeConversion;
import '../universe/call_structure.dart' show CallStructure;
import '../universe/use.dart' show StaticUse;
-import 'backend_helpers.dart';
import 'namer.dart' show Namer;
class CheckedModeHelper {
@@ -22,11 +21,11 @@ class CheckedModeHelper {
const CheckedModeHelper(String this.name);
- StaticUse getStaticUse(BackendHelpers helpers) {
+ StaticUse getStaticUse(CommonElements commonElements) {
// TODO(johnniwinther): Refactor this to avoid looking up directly in the
- // js helper library but instead access helpers directly on backend helpers.
+ // js helper library but instead access commonElements.
return new StaticUse.staticInvoke(
- helpers.findHelperFunction(name), callStructure);
+ commonElements.findHelperFunction(name), callStructure);
}
CallStructure get callStructure => CallStructure.ONE_ARG;
@@ -112,9 +111,8 @@ class SubtypeCheckedModeHelper extends CheckedModeHelper {
class CheckedModeHelpers {
final CommonElements _commonElements;
- final BackendHelpers _helpers;
- CheckedModeHelpers(this._commonElements, this._helpers);
+ CheckedModeHelpers(this._commonElements);
/// All the checked mode helpers.
static const List<CheckedModeHelper> helpers = const <CheckedModeHelper>[
@@ -232,35 +230,35 @@ class CheckedModeHelpers {
// nativeCheckOnly || emitter.nativeEmitter.requiresNativeIsCheck(element);
var suffix = typeCast ? 'TypeCast' : 'TypeCheck';
- if (element == _helpers.jsStringClass ||
+ if (element == _commonElements.jsStringClass ||
element == _commonElements.stringClass) {
if (nativeCheckOnly) return null;
return 'string$suffix';
}
- if (element == _helpers.jsDoubleClass ||
+ if (element == _commonElements.jsDoubleClass ||
element == _commonElements.doubleClass) {
if (nativeCheckOnly) return null;
return 'double$suffix';
}
- if (element == _helpers.jsNumberClass ||
+ if (element == _commonElements.jsNumberClass ||
element == _commonElements.numClass) {
if (nativeCheckOnly) return null;
return 'num$suffix';
}
- if (element == _helpers.jsBoolClass ||
+ if (element == _commonElements.jsBoolClass ||
element == _commonElements.boolClass) {
if (nativeCheckOnly) return null;
return 'bool$suffix';
}
- if (element == _helpers.jsIntClass ||
+ if (element == _commonElements.jsIntClass ||
element == _commonElements.intClass ||
- element == _helpers.jsUInt32Class ||
- element == _helpers.jsUInt31Class ||
- element == _helpers.jsPositiveIntClass) {
+ element == _commonElements.jsUInt32Class ||
+ element == _commonElements.jsUInt31Class ||
+ element == _commonElements.jsPositiveIntClass) {
if (nativeCheckOnly) return null;
return 'int$suffix';
}
@@ -276,7 +274,7 @@ class CheckedModeHelpers {
}
if ((element == _commonElements.listClass ||
- element == _helpers.jsArrayClass) &&
+ element == _commonElements.jsArrayClass) &&
type.treatAsRaw) {
if (nativeCheckOnly) return null;
return 'list$suffix';
« no previous file with comments | « pkg/compiler/lib/src/js_backend/backend_usage.dart ('k') | pkg/compiler/lib/src/js_backend/codegen_listener.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698