fix other files in kernel after roll

pkg/compiler/lib/src/kernel/unresolved.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.md file.
 
 import 'package:kernel/ast.dart' as ir;
 
 import "../dart_types.dart" show DartType, InterfaceType;
 import "../elements/elements.dart"
     show
         AstElement,
@@ skipping 112 matching lines @@
         name,
         new ir.Arguments(<ir.Expression>[argument]));
   }
 
   ir.Expression buildThrowSingleArgumentError(
       ir.Procedure exceptionBuilder, String errorMessage) {
     return new ir.Throw(new ir.StaticInvocation(exceptionBuilder,
         new ir.Arguments(<ir.Expression>[new ir.StringLiteral(errorMessage)])));
   }
 
+  SuperIndexAccessor buildUnresolvedSuperIndexAccessor(
+      Node index, Element element) {
+    ir.Member member = possiblyErroneousFunctionToIr(element);
+    return new SuperIndexAccessor(this, visitForValue(index), member, member);
+  }
+
+  SuperPropertyAccessor buildUnresolvedSuperPropertyAccessor(
+      String name, Element getter) {
+    return new SuperPropertyAccessor(this, kernel.irName(name, currentElement),
+        getter == null ? null : possiblyErroneousFunctionToIr(getter), null);
+  }
+
   ir.Expression visitUnresolvedClassConstructorInvoke(
       NewExpression node,
       ErroneousElement element,
       DartType type,
       NodeList arguments,
       Selector selector,
       _) {
     // TODO(asgerf): The VM includes source information as part of the error
     //   message.  We could do the same when we add source maps.
     return buildThrowSingleArgumentError(
@@ skipping 130 matching lines @@
         new ir.Arguments(<ir.Expression>[visitForValue(argument)]));
   }
 
   ir.Expression visitUnresolvedSuperCompound(
       Send node, Element element, AssignmentOperator operator, Node rhs, _) {
     return buildThrowUnresolvedSuperGetter('${node.selector}');
   }
 
   ir.Expression visitUnresolvedSuperCompoundIndexSet(Send node, Element element,
       Node index, AssignmentOperator operator, Node rhs, _) {
-    var accessor = new SuperIndexAccessor(this, visitForValue(index),
-        possiblyErroneousFunctionToIr(element), null);
-    return accessor.buildCompoundAssignment(
-        new ir.Name(operator.selectorName), visitForValue(rhs));
+    return buildUnresolvedSuperIndexAccessor(index, element)
+        .buildCompoundAssignment(
+            new ir.Name(operator.selectorName), visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperGet(Send node, Element element, _) {
     return buildThrowUnresolvedSuperGetter('${node.selector}');
   }
 
   ir.Expression visitUnresolvedSuperGetterCompound(Send node, Element element,
       MethodElement setter, AssignmentOperator operator, Node rhs, _) {
     return buildThrowUnresolvedSuperGetter('${node.selector}');
   }
@@ skipping 39 matching lines @@
     return buildThrowUnresolvedSuperGetter('${node.selector}');
   }
 
   ir.Expression visitUnresolvedSuperGetterSetIfNull(
       Send node, Element element, MethodElement setter, Node rhs, _) {
     return buildThrowUnresolvedSuperGetter('${node.selector}');
   }
 
   ir.Expression visitUnresolvedSuperIndex(
       Send node, Element element, Node index, _) {
-    return new SuperIndexAccessor(this, visitForValue(index), null, null)
-        .buildSimpleRead();
+    return buildUnresolvedSuperIndexAccessor(index, element).buildSimpleRead();
   }
 
   ir.Expression visitUnresolvedSuperIndexPostfix(
       Send node, Element element, Node index, IncDecOperator operator, _) {
-    return new SuperIndexAccessor(this, visitForValue(index), null, null)
-        .buildSimpleRead();
+    return buildUnresolvedSuperIndexAccessor(index, element).buildSimpleRead();
   }
 
   ir.Expression visitUnresolvedSuperIndexPrefix(
       Send node, Element element, Node index, IncDecOperator operator, _) {
-    return new SuperIndexAccessor(this, visitForValue(index), null, null)
-        .buildSimpleRead();
+    return buildUnresolvedSuperIndexAccessor(index, element).buildSimpleRead();
   }
 
   ir.Expression visitUnresolvedSuperIndexSet(
       Send node, Element element, Node index, Node rhs, _) {
-    return new SuperIndexAccessor(this, visitForValue(index), null, null)
+    return buildUnresolvedSuperIndexAccessor(index, element)
         .buildAssignment(visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperInvoke(
       Send node, Element element, NodeList arguments, Selector selector, _) {
     // TODO(asgerf): Should really invoke 'super.noSuchMethod'.
     return buildThrowNoSuchMethodError(kernel.getUnresolvedSuperMethodBuilder(),
         new ir.ThisExpression(), '${node.selector}', buildArguments(arguments));
   }
 
@@ skipping 12 matching lines @@
     return buildThrowUnresolvedSuperGetter('${node.selector}');
   }
 
   ir.Expression visitUnresolvedSuperSetterCompound(
       Send node,
       MethodElement getter,
       Element element,
       AssignmentOperator operator,
       Node rhs,
       _) {
-    var accessor = new SuperPropertyAccessor(
-        this, '${node.selector}', possiblyErroneousFunctionToIr(getter), null);
-    return accessor.buildCompoundAssignment(
-        new ir.Name(operator.selectorName), visitForValue(rhs));
+    return buildUnresolvedSuperPropertyAccessor('${node.selector}', getter)
+        .buildCompoundAssignment(
+            new ir.Name(operator.selectorName), visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperSetterCompoundIndexSet(
       Send node,
       MethodElement getter,
       Element element,
       Node index,
       AssignmentOperator operator,
       Node rhs,
       _) {
-    var accessor = new SuperIndexAccessor(this, visitForValue(index),
-        possiblyErroneousFunctionToIr(getter), null);
-    return accessor.buildCompoundAssignment(
-        new ir.Name(operator.selectorName), visitForValue(rhs));
+    return buildUnresolvedSuperIndexAccessor(index, element)
+        .buildCompoundAssignment(
+            new ir.Name(operator.selectorName), visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperSetterIndexPostfix(
       Send node,
       MethodElement indexFunction,
       Element element,
       Node index,
       IncDecOperator operator,
       _) {
-    var accessor = new SuperIndexAccessor(this, visitForValue(index),
-        possiblyErroneousFunctionToIr(indexFunction), null);
-    return accessor.buildPostfixIncrement(new ir.Name(operator.selectorName));
+    return buildUnresolvedSuperIndexAccessor(index, element)
+        .buildPostfixIncrement(new ir.Name(operator.selectorName));
   }
 
   ir.Expression visitUnresolvedSuperSetterIndexPrefix(
       Send node,
       MethodElement indexFunction,
       Element element,
       Node index,
       IncDecOperator operator,
       _) {
-    var accessor = new SuperIndexAccessor(this, visitForValue(index),
-        possiblyErroneousFunctionToIr(indexFunction), null);
-    return accessor.buildPrefixIncrement(new ir.Name(operator.selectorName));
+    return buildUnresolvedSuperIndexAccessor(index, element)
+        .buildPrefixIncrement(new ir.Name(operator.selectorName));
   }
 
   ir.Expression visitUnresolvedSuperSetterPostfix(Send node,
       MethodElement getter, Element element, IncDecOperator operator, _) {
-    var accessor = new SuperPropertyAccessor(
-        this, '${node.selector}', possiblyErroneousFunctionToIr(getter), null);
-    return accessor.buildPostfixIncrement(new ir.Name(operator.selectorName));
+    return buildUnresolvedSuperPropertyAccessor('${node.selector}', getter)
+        .buildPostfixIncrement(new ir.Name(operator.selectorName));
   }
 
   ir.Expression visitUnresolvedSuperSetterPrefix(Send node,
       MethodElement getter, Element element, IncDecOperator operator, _) {
-    var accessor = new SuperPropertyAccessor(
-        this, '${node.selector}', possiblyErroneousFunctionToIr(getter), null);
-    return accessor.buildPrefixIncrement(new ir.Name(operator.selectorName));
+    return buildUnresolvedSuperPropertyAccessor('${node.selector}', getter)
+        .buildPrefixIncrement(new ir.Name(operator.selectorName));
   }
 
   ir.Expression visitUnresolvedSuperSetterSetIfNull(
       Send node, MethodElement getter, Element element, Node rhs, _) {
-    var accessor = new SuperPropertyAccessor(
-        this, '${node.selector}', possiblyErroneousFunctionToIr(getter), null);
-    return accessor.buildNullAwareAssignment(visitForValue(rhs));
+    return buildUnresolvedSuperPropertyAccessor('${node.selector}', getter)
+        .buildNullAwareAssignment(visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperUnary(
       Send node, UnaryOperator operator, Element element, _) {
     // TODO(asgerf): Should really call 'super.noSuchMethod'.
     return buildThrowNoSuchMethodError(
         kernel.getUnresolvedSuperMethodBuilder(),
         new ir.ThisExpression(),
         operator.selectorName,
         new ir.Arguments.empty());
@@ skipping 61 matching lines @@
   ir.Expression visitUnresolvedTopLevelSetterSetIfNull(
       Send node, MethodElement getter, Element element, Node rhs, _) {
     var accessor = new TopLevelStaticAccessor(
         this, getter.name, possiblyErroneousFunctionToIr(getter), null);
     return accessor.buildNullAwareAssignment(visitForValue(rhs),
         voidContext: isVoidContext);
   }
 
   ir.Expression visitUnresolvedSuperGetterIndexSetIfNull(Send node,
       Element element, MethodElement setter, Node index, Node rhs, _) {
-    var accessor = new SuperIndexAccessor(this, visitForValue(index), null,
-        possiblyErroneousFunctionToIr(setter));
-    return accessor.buildNullAwareAssignment(visitForValue(rhs));
+    return buildUnresolvedSuperIndexAccessor(index, element)
+        .buildNullAwareAssignment(visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperSetterIndexSetIfNull(Send node,
       MethodElement getter, Element element, Node index, Node rhs, _) {
-    var accessor = new SuperIndexAccessor(this, visitForValue(index),
-        possiblyErroneousFunctionToIr(getter), null);
-    return accessor.buildNullAwareAssignment(visitForValue(rhs));
+    return buildUnresolvedSuperIndexAccessor(index, element)
+        .buildNullAwareAssignment(visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperIndexSetIfNull(
       Send node, Element element, Node index, Node rhs, _) {
-    var accessor =
-        new SuperIndexAccessor(this, visitForValue(index), null, null);
-    return accessor.buildNullAwareAssignment(visitForValue(rhs));
+    return buildUnresolvedSuperIndexAccessor(index, element)
+        .buildNullAwareAssignment(visitForValue(rhs));
   }
 
   ir.Expression visitUnresolvedSuperSet(
       Send node, Element element, Node rhs, _) {
     return buildThrowUnresolvedSuperSetter(
         '${node.selector}', visitForValue(rhs));
   }
 }