| Index: pkg/compiler/lib/src/ssa/codegen.dart
|
| diff --git a/pkg/compiler/lib/src/ssa/codegen.dart b/pkg/compiler/lib/src/ssa/codegen.dart
|
| index 752df171597b0a3b6a770cc34b04ca12b3749807..21387ea8f698d760324afafc74d0e37e5549e16d 100644
|
| --- a/pkg/compiler/lib/src/ssa/codegen.dart
|
| +++ b/pkg/compiler/lib/src/ssa/codegen.dart
|
| @@ -1473,7 +1473,8 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
|
|
| void visitInterceptor(HInterceptor node) {
|
| registry.registerSpecializedGetInterceptor(node.interceptedClasses);
|
| - String name = backend.namer.nameForGetInterceptor(node.interceptedClasses);
|
| + String name = backend.namer.getInterceptorName(
|
| + backend.getInterceptorMethod, node.interceptedClasses);
|
| var isolate = new js.VariableUse(
|
| backend.namer.globalObjectFor(backend.interceptorsLibrary));
|
| use(node.receiver);
|
| @@ -1519,7 +1520,7 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
| void visitInvokeConstructorBody(HInvokeConstructorBody node) {
|
| use(node.inputs[0]);
|
| js.Expression object = pop();
|
| - String methodName = backend.namer.instanceMethodName(node.element);
|
| + String methodName = backend.namer.getNameOfInstanceMember(node.element);
|
| List<js.Expression> arguments = visitArguments(node.inputs);
|
| push(js.propertyCall(object, methodName, arguments), node);
|
| registry.registerStaticUse(node.element);
|
| @@ -1659,7 +1660,7 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
| methodName = backend.namer.invocationName(selector);
|
| } else {
|
| assert(invariant(node, compiler.hasIncrementalSupport));
|
| - methodName = backend.namer.instanceMethodName(superMethod);
|
| + methodName = backend.namer.getNameOfInstanceMember(superMethod);
|
| }
|
| push(js.js('#.#.call(#)',
|
| [backend.emitter.prototypeAccess(superClass,
|
| @@ -1670,7 +1671,7 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
| use(node.receiver);
|
| push(
|
| js.js('#.#(#)', [
|
| - pop(), backend.namer.aliasedSuperMemberPropertyName(superMethod),
|
| + pop(), backend.namer.getNameOfAliasedSuperMember(superMethod),
|
| visitArguments(node.inputs, start: 1)]), // Skip receiver argument.
|
| node);
|
| }
|
| @@ -2631,7 +2632,7 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
| } else {
|
| backend.emitter.registerReadTypeVariable(element);
|
| push(js.js('#.#()',
|
| - [pop(), backend.namer.nameForReadTypeVariable(element)]));
|
| + [pop(), backend.namer.readTypeVariableName(element)]));
|
| }
|
| } else {
|
| push(js.js('#(#)', [
|
|
|