Handle super accesses loaded from .dill

pkg/compiler/lib/src/ssa/kernel_impact.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/names.dart';
 import '../compiler.dart';
 import '../constants/expressions.dart';
@@ skipping 46 matching lines @@
       throw "FOUND NULL FIELD: $element";
     }
   } else {
     throw new UnsupportedError("Unsupported element: $element");
   }
   return member;
 }
 
 ResolutionImpact buildKernelImpact(
     ir.Member member, KernelToElementMap elementAdapter) {
-  KernelImpactBuilder builder =
-      new KernelImpactBuilder('${member.name}', elementAdapter);
+  KernelImpactBuilder builder = new KernelImpactBuilder(elementAdapter, member);
   if (member is ir.Procedure) {
     return builder.buildProcedure(member);
   } else if (member is ir.Constructor) {
     return builder.buildConstructor(member);
   } else if (member is ir.Field) {
     return builder.buildField(member);
   }
   throw new UnsupportedError("Unsupported member: $member");
 }
 
 class KernelImpactBuilder extends ir.Visitor {
   final ResolutionWorldImpactBuilder impactBuilder;
   final KernelToElementMap elementAdapter;
+  final ir.Member currentMember;
 
-  KernelImpactBuilder(String name, this.elementAdapter)
-      : this.impactBuilder = new ResolutionWorldImpactBuilder(name);
+  KernelImpactBuilder(this.elementAdapter, this.currentMember)
+      : this.impactBuilder =
+            new ResolutionWorldImpactBuilder('${currentMember.name}');
 
   CommonElements get commonElements => elementAdapter.commonElements;
 
   /// Add a checked-mode type use of [type] if it is not `dynamic`.
   DartType checkType(ir.DartType irType) {
     DartType type = elementAdapter.getDartType(irType);
     if (!type.isDynamic) {
       impactBuilder.registerTypeUse(new TypeUse.checkedModeCheck(type));
     }
     return type;
@@ skipping 287 matching lines @@
     }
   }
 
   @override
   void visitStaticSet(ir.StaticSet node) {
     visitNode(node.value);
     MemberEntity member = elementAdapter.getMember(node.target);
     impactBuilder.registerStaticUse(new StaticUse.staticSet(member));
   }
 
-  void handleSuperInvocation(ir.Node target, ir.Node arguments) {
-    FunctionEntity method = elementAdapter.getMethod(target);
+  void handleSuperInvocation(ir.Name name, ir.Node target, ir.Node arguments) {
+    FunctionEntity method = elementAdapter
+        .getSuperMember(currentMember, name, target, setter: false);
     _visitArguments(arguments);
     impactBuilder.registerStaticUse(new StaticUse.superInvoke(
         method, elementAdapter.getCallStructure(arguments)));
   }
 
   @override
   void visitDirectMethodInvocation(ir.DirectMethodInvocation node) {
-    handleSuperInvocation(node.target, node.arguments);
+    handleSuperInvocation(node.name, node.target, node.arguments);
   }
 
   @override
   void visitSuperMethodInvocation(ir.SuperMethodInvocation node) {
     // TODO(johnniwinther): Should we support this or always use the
     // [MixinFullResolution] transformer?
-    handleSuperInvocation(node.interfaceTarget, node.arguments);
+    handleSuperInvocation(node.name, node.interfaceTarget, node.arguments);
   }
 
-  void handleSuperGet(ir.Member target) {
-    if (target is ir.Procedure && target.kind == ir.ProcedureKind.Method) {
-      FunctionEntity method = elementAdapter.getMethod(target);
-      impactBuilder.registerStaticUse(new StaticUse.superTearOff(method));
+  void handleSuperGet(ir.Name name, ir.Member target) {
+    MemberEntity member = elementAdapter
+        .getSuperMember(currentMember, name, target, setter: false);
+    if (member.isFunction) {
+      impactBuilder.registerStaticUse(new StaticUse.superTearOff(member));
     } else {
-      MemberEntity member = elementAdapter.getMember(target);
       impactBuilder.registerStaticUse(new StaticUse.superGet(member));
     }
   }
 
   @override
   void visitDirectPropertyGet(ir.DirectPropertyGet node) {
-    handleSuperGet(node.target);
+    handleSuperGet(null, node.target);
   }
 
   @override
   void visitSuperPropertyGet(ir.SuperPropertyGet node) {
-    handleSuperGet(node.interfaceTarget);
+    handleSuperGet(node.name, node.interfaceTarget);
   }
 
-  void handleSuperSet(ir.Node target, ir.Node value) {
+  void handleSuperSet(ir.Name name, ir.Node target, ir.Node value) {
     visitNode(value);
-    if (target is ir.Field) {
-      FieldEntity field = elementAdapter.getField(target);
-      impactBuilder.registerStaticUse(new StaticUse.superFieldSet(field));
+    MemberEntity member = elementAdapter
+        .getSuperMember(currentMember, name, target, setter: true);
+    if (member.isField) {
+      impactBuilder.registerStaticUse(new StaticUse.superFieldSet(member));
     } else {
-      FunctionEntity method = elementAdapter.getMethod(target);
-      impactBuilder.registerStaticUse(new StaticUse.superSetterSet(method));
+      impactBuilder.registerStaticUse(new StaticUse.superSetterSet(member));
     }
   }
 
   @override
   void visitDirectPropertySet(ir.DirectPropertySet node) {
-    handleSuperSet(node.target, node.value);
+    handleSuperSet(null, node.target, node.value);
   }
 
   @override
   void visitSuperPropertySet(ir.SuperPropertySet node) {
-    handleSuperSet(node.interfaceTarget, node.value);
+    handleSuperSet(node.name, node.interfaceTarget, node.value);
   }
 
   @override
   void visitMethodInvocation(ir.MethodInvocation invocation) {
     var receiver = invocation.receiver;
     if (receiver is ir.VariableGet &&
         receiver.variable.isFinal &&
         receiver.variable.parent is ir.FunctionDeclaration) {
       // Invocation of a local function. No need for dynamic use.
     } else {
@@ skipping 142 matching lines @@
     ConstructorEntity target = elementAdapter.getConstructor(node.target);
     impactBuilder.registerStaticUse(new StaticUse.superConstructorInvoke(
         target, elementAdapter.getCallStructure(node.arguments)));
   }
 
   // TODO(johnniwinther): Make this throw and visit child nodes explicitly
   // instead to ensure that we don't visit unwanted parts of the ir.
   @override
   void defaultNode(ir.Node node) => node.visitChildren(this);
 }