| Index: pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
|
| index 62f5e812b3f290786aac5fcef806413bc5df465d..10e20d86d92a30cadd5ce4dfa9ef026947339452 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
|
| @@ -381,7 +381,7 @@ class Emitter implements js_emitter.Emitter {
|
| return jsAst.js.expressionTemplateFor('#.substring($isPrefixLength)');
|
|
|
| case JsBuiltin.isFunctionType:
|
| - return backend.rti.representationGenerator.templateForIsFunctionType;
|
| + return backend.rtiEncoder.templateForIsFunctionType;
|
|
|
| case JsBuiltin.rawRtiToJsConstructorName:
|
| return jsAst.js.expressionTemplateFor("#.$typeNameProperty");
|
| @@ -390,8 +390,7 @@ class Emitter implements js_emitter.Emitter {
|
| return jsAst.js.expressionTemplateFor("#.constructor");
|
|
|
| case JsBuiltin.createFunctionTypeRti:
|
| - return backend.rti.representationGenerator
|
| - .templateForCreateFunctionType;
|
| + return backend.rtiEncoder.templateForCreateFunctionType;
|
|
|
| case JsBuiltin.isSubtype:
|
| // TODO(floitsch): move this closer to where is-check properties are
|
| @@ -845,12 +844,12 @@ class Emitter implements js_emitter.Emitter {
|
| jsAst.Statement buildFunctionThatReturnsNull() {
|
| return js.statement('#.# = function() {}',
|
| [namer.isolateName,
|
| - backend.rti.getFunctionThatReturnsNullName]);
|
| + backend.rtiEncoder.getFunctionThatReturnsNullName]);
|
| }
|
|
|
| jsAst.Expression generateFunctionThatReturnsNull() {
|
| return js("#.#", [namer.isolateName,
|
| - backend.rti.getFunctionThatReturnsNullName]);
|
| + backend.rtiEncoder.getFunctionThatReturnsNullName]);
|
| }
|
|
|
| buildMain(jsAst.Statement invokeMain) {
|
| @@ -1017,7 +1016,7 @@ class Emitter implements js_emitter.Emitter {
|
| 'outputContainsConstantList': outputContainsConstantList,
|
| 'makeConstListProperty': makeConstListProperty,
|
| 'functionThatReturnsNullProperty':
|
| - backend.rti.getFunctionThatReturnsNullName,
|
| + backend.rtiEncoder.getFunctionThatReturnsNullName,
|
| 'hasIncrementalSupport': compiler.hasIncrementalSupport,
|
| 'lazyInitializerProperty': lazyInitializerProperty,});
|
| }
|
|
|