| 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 9aa818493c63fc7eaf314bef5aa7df2d118ae6de..f641db6f6dac73e2b1f41bcf0d29c5e1f6621fc9 100644
|
| --- a/pkg/compiler/lib/src/ssa/codegen.dart
|
| +++ b/pkg/compiler/lib/src/ssa/codegen.dart
|
| @@ -322,7 +322,8 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
| .visitGraph(graph);
|
| new SsaTypeKnownRemover().visitGraph(graph);
|
| new SsaTrustedCheckRemover(compiler.options).visitGraph(graph);
|
| - new SsaInstructionMerger(generateAtUseSite, backend).visitGraph(graph);
|
| + new SsaInstructionMerger(generateAtUseSite, backend.superMemberData)
|
| + .visitGraph(graph);
|
| new SsaConditionMerger(generateAtUseSite, controlFlowOperators)
|
| .visitGraph(graph);
|
| SsaLiveIntervalBuilder intervalBuilder =
|
| @@ -1900,7 +1901,8 @@ class SsaCodeGenerator implements HVisitor, HBlockInformationVisitor {
|
| }
|
| } else {
|
| Selector selector = node.selector;
|
| - if (!backend.maybeRegisterAliasedSuperMember(superElement, selector)) {
|
| + if (!backend.superMemberData
|
| + .maybeRegisterAliasedSuperMember(superElement, selector)) {
|
| js.Name methodName;
|
| if (selector.isGetter && !superElement.isGetter) {
|
| // If this is a tear-off, register the fact that a tear-off closure
|
|
|