Index: pkg/compiler/lib/src/js_emitter/type_test_registry.dart |
diff --git a/pkg/compiler/lib/src/js_emitter/type_test_registry.dart b/pkg/compiler/lib/src/js_emitter/type_test_registry.dart |
index 5938c6979d2180340267e1141aabe1ffa7bfd41e..b6d7c76fe843e5e04064677731c26a30992edafa 100644 |
--- a/pkg/compiler/lib/src/js_emitter/type_test_registry.dart |
+++ b/pkg/compiler/lib/src/js_emitter/type_test_registry.dart |
@@ -6,11 +6,10 @@ library dart2js.js_emitter.type_test_registry; |
import '../common.dart'; |
import '../common_elements.dart'; |
-import '../elements/elements.dart' show ClassElement, MethodElement; |
+import '../elements/elements.dart' show MethodElement; |
import '../elements/entities.dart'; |
import '../elements/types.dart' show DartType; |
-import '../elements/resolution_types.dart' |
- show ResolutionFunctionType, ResolutionTypeVariableType; |
+import '../elements/resolution_types.dart' show ResolutionTypeVariableType; |
import '../elements/types.dart'; |
import '../js_backend/runtime_types.dart' |
show |
@@ -88,10 +87,10 @@ class TypeTestRegistry { |
* complete. Not all classes will go away while constructors are referenced |
* from type substitutions. |
*/ |
- Set<ClassElement> computeClassesModifiedByEmitRuntimeTypeSupport() { |
+ Set<ClassEntity> computeClassesModifiedByEmitRuntimeTypeSupport() { |
TypeChecks typeChecks = rtiChecks.requiredChecks; |
- Set<ClassElement> result = new Set<ClassElement>(); |
- for (ClassElement cls in typeChecks.classes) { |
+ Set<ClassEntity> result = new Set<ClassEntity>(); |
+ for (ClassEntity cls in typeChecks.classes) { |
if (typeChecks[cls].isNotEmpty) result.add(cls); |
} |
return result; |
@@ -101,11 +100,11 @@ class TypeTestRegistry { |
MirrorsData mirrorsData, Iterable<MemberEntity> liveMembers) { |
_rtiNeededClasses = new Set<ClassEntity>(); |
- void addClassWithSuperclasses(ClassElement cls) { |
+ void addClassWithSuperclasses(ClassEntity cls) { |
_rtiNeededClasses.add(cls); |
- for (ClassElement superclass = cls.superclass; |
+ for (ClassEntity superclass = _elementEnvironment.getSuperClass(cls); |
superclass != null; |
- superclass = superclass.superclass) { |
+ superclass = _elementEnvironment.getSuperClass(superclass)) { |
_rtiNeededClasses.add(superclass); |
} |
} |
@@ -134,8 +133,8 @@ class TypeTestRegistry { |
// 3. Add classes that contain checked generic function types. These are |
// needed to store the signature encoding. |
- for (ResolutionFunctionType type in checkedFunctionTypes) { |
- ClassElement contextClass = DartTypes.getClassContext(type); |
+ for (FunctionType type in checkedFunctionTypes) { |
+ ClassEntity contextClass = DartTypes.getClassContext(type); |
if (contextClass != null) { |
_rtiNeededClasses.add(contextClass); |
} |