Index: pkg/compiler/lib/src/js_emitter/program_builder/collector.dart |
diff --git a/pkg/compiler/lib/src/js_emitter/program_builder/collector.dart b/pkg/compiler/lib/src/js_emitter/program_builder/collector.dart |
index d5a0794225371770ecb28d6cb9176da112bfe8a7..268d67150f357bc270cc85d6c711aca02428e343 100644 |
--- a/pkg/compiler/lib/src/js_emitter/program_builder/collector.dart |
+++ b/pkg/compiler/lib/src/js_emitter/program_builder/collector.dart |
@@ -42,6 +42,8 @@ class Collector { |
JavaScriptBackend get backend => compiler.backend; |
+ BackendHelpers get helpers => backend.helpers; |
+ |
CoreClasses get coreClasses => compiler.coreClasses; |
Collector(this.compiler, this.namer, this.rtiNeededClasses, this.emitter); |
@@ -92,12 +94,12 @@ class Collector { |
} |
// These classes are just helpers for the backend's type system. |
- unneededClasses.add(backend.jsMutableArrayClass); |
- unneededClasses.add(backend.jsFixedArrayClass); |
- unneededClasses.add(backend.jsExtendableArrayClass); |
- unneededClasses.add(backend.jsUInt32Class); |
- unneededClasses.add(backend.jsUInt31Class); |
- unneededClasses.add(backend.jsPositiveIntClass); |
+ unneededClasses.add(helpers.jsMutableArrayClass); |
+ unneededClasses.add(helpers.jsFixedArrayClass); |
+ unneededClasses.add(helpers.jsExtendableArrayClass); |
+ unneededClasses.add(helpers.jsUInt32Class); |
+ unneededClasses.add(helpers.jsUInt31Class); |
+ unneededClasses.add(helpers.jsPositiveIntClass); |
return (ClassElement cls) => !unneededClasses.contains(cls); |
} |
@@ -215,22 +217,22 @@ class Collector { |
neededClasses.addAll(classesOnlyNeededForRti); |
// TODO(18175, floitsch): remove once issue 18175 is fixed. |
- if (neededClasses.contains(backend.jsIntClass)) { |
+ if (neededClasses.contains(helpers.jsIntClass)) { |
neededClasses.add(coreClasses.intClass); |
} |
- if (neededClasses.contains(backend.jsDoubleClass)) { |
+ if (neededClasses.contains(helpers.jsDoubleClass)) { |
neededClasses.add(coreClasses.doubleClass); |
} |
- if (neededClasses.contains(backend.jsNumberClass)) { |
+ if (neededClasses.contains(helpers.jsNumberClass)) { |
neededClasses.add(coreClasses.numClass); |
} |
- if (neededClasses.contains(backend.jsStringClass)) { |
+ if (neededClasses.contains(helpers.jsStringClass)) { |
neededClasses.add(coreClasses.stringClass); |
} |
- if (neededClasses.contains(backend.jsBoolClass)) { |
+ if (neededClasses.contains(helpers.jsBoolClass)) { |
neededClasses.add(coreClasses.boolClass); |
} |
- if (neededClasses.contains(backend.jsArrayClass)) { |
+ if (neededClasses.contains(helpers.jsArrayClass)) { |
neededClasses.add(coreClasses.listClass); |
} |