| Index: pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart b/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart
|
| index 7cffc44de5b73cf6b1b931433b9aa6870d4f312e..c6365ae81f1a03e014d709bd5594ecab4ae6a6d8 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart
|
| @@ -35,7 +35,7 @@ class RuntimeTypeGenerator {
|
|
|
| JavaScriptBackend get backend => compiler.backend;
|
| TypeTestRegistry get typeTestRegistry => emitterTask.typeTestRegistry;
|
| - CoreClasses get coreClasses => compiler.coreClasses;
|
| + CommonElements get commonElements => compiler.commonElements;
|
|
|
| Set<ClassElement> get checkedClasses => typeTestRegistry.checkedClasses;
|
|
|
| @@ -193,7 +193,7 @@ class RuntimeTypeGenerator {
|
| bool supertypesNeedSubstitutions = false;
|
|
|
| if (superclass != null &&
|
| - superclass != coreClasses.objectClass &&
|
| + superclass != commonElements.objectClass &&
|
| !haveSameTypeVariables(cls, superclass)) {
|
| // We cannot inherit the generated substitutions, because the type
|
| // variable layout for this class is different. Instead we generate
|
| @@ -238,7 +238,7 @@ class RuntimeTypeGenerator {
|
|
|
| // A class that defines a `call` method implicitly implements
|
| // [Function] and needs checks for all typedefs that are used in is-checks.
|
| - if (checkedClasses.contains(coreClasses.functionClass) ||
|
| + if (checkedClasses.contains(commonElements.functionClass) ||
|
| checkedFunctionTypes.isNotEmpty) {
|
| Element call = cls.lookupLocalMember(Identifiers.call);
|
| if (call == null) {
|
| @@ -249,9 +249,9 @@ class RuntimeTypeGenerator {
|
| FunctionElement callFunction = call;
|
| // A superclass might already implement the Function interface. In such
|
| // a case, we can avoid emiting the is test here.
|
| - if (!cls.superclass.implementsFunction(coreClasses)) {
|
| - _generateInterfacesIsTests(coreClasses.functionClass, generateIsTest,
|
| - generateSubstitution, generated);
|
| + if (!cls.superclass.implementsFunction(commonElements)) {
|
| + _generateInterfacesIsTests(commonElements.functionClass,
|
| + generateIsTest, generateSubstitution, generated);
|
| }
|
| FunctionType callType = callFunction.computeType(compiler.resolution);
|
| generateFunctionTypeSignature(callFunction, callType);
|
|
|