Fine-grain field, getter, setter, and function access in IrBuilder.

pkg/analyzer2dart/lib/src/cps_generator.dart

 // Copyright (c) 2014, 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.
 
 library analyzer2dart.cps_generator;
 
 import 'package:analyzer/analyzer.dart';
 
 import 'package:compiler/src/dart_types.dart' as dart2js;
 import 'package:compiler/src/elements/elements.dart' as dart2js;
@@ skipping 184 matching lines @@
             node.argumentList, node.methodName.name),
         arguments);
   }
 
   @override
   ir.Primitive visitStaticMethodInvocation(MethodInvocation node,
                                            AccessSemantics semantics) {
     analyzer.Element staticElement = semantics.element;
     dart2js.Element element = converter.convertElement(staticElement);
     List<ir.Primitive> arguments = visitArguments(node.argumentList);
-    return irBuilder.buildStaticInvocation(
+    return irBuilder.buildStaticFunctionInvocation(
         element,
         createSelectorFromMethodInvocation(
             node.argumentList, node.methodName.name),
         arguments);
   }
 
   @override
   ir.Node visitLocalFunctionAccess(AstNode node, AccessSemantics semantics) {
     return handleLocalAccess(node, semantics);
   }
 
   ir.Primitive handleLocalInvocation(MethodInvocation node,
                                      AccessSemantics semantics) {
     analyzer.Element staticElement = semantics.element;
     dart2js.Element element = converter.convertElement(staticElement);
-    ir.Primitive receiver = irBuilder.buildLocalGet(element);
     List<ir.Definition> arguments = visitArguments(node.argumentList);
-    return irBuilder.buildCallInvocation(
-      receiver,
-      createSelectorFromMethodInvocation(
-          node.argumentList, node.methodName.name),
-      arguments);
+    Selector selector = createSelectorFromMethodInvocation(
+        node.argumentList, node.methodName.name);
+    if (semantics.kind == AccessKind.LOCAL_FUNCTION) {
+      return irBuilder.buildLocalFunctionInvocation(
+          element, selector, arguments);
+    } else {
+      return irBuilder.buildLocalVariableInvocation(
+        element, selector, arguments);
+    }
   }
 
   @override
   ir.Node visitLocalVariableInvocation(MethodInvocation node,
                                        AccessSemantics semantics) {
     return handleLocalInvocation(node, semantics);
   }
 
   @override
   ir.Primitive visitLocalFunctionInvocation(MethodInvocation node,
@@ skipping 103 matching lines @@
   }
 
   dart2js.Element getLocal(AstNode node, AccessSemantics semantics) {
     analyzer.Element element = semantics.element;
     dart2js.Element target = converter.convertElement(element);
     assert(invariant(node, target.isLocal, '$target expected to be local.'));
     return target;
   }
 
   ir.Primitive handleLocalAccess(AstNode node, AccessSemantics semantics) {
-    return irBuilder.buildLocalGet(getLocal(node, semantics));
+    dart2js.Element local = getLocal(node, semantics);
+    if (semantics.kind == AccessKind.LOCAL_FUNCTION) {
+      return irBuilder.buildLocalFunctionGet(local);
+    } else {
+      return irBuilder.buildLocalVariableGet(local);
+    }
   }
 
   ir.Primitive handleLocalAssignment(AssignmentExpression node,
                                      AccessSemantics semantics) {
     if (node.operator.lexeme != '=') {
       return giveUp(node, 'Assignment operator: ${node.operator.lexeme}');
     }
-    return irBuilder.buildLocalSet(
+    return irBuilder.buildLocalVariableSet(
         getLocal(node, semantics),
         build(node.rightHandSide));
   }
 
   @override
   ir.Node visitAssignmentExpression(AssignmentExpression node) {
     // Avoid eager visiting of left and right hand side.
     return handleAssignmentExpression(node);
   }
 
@@ skipping 14 matching lines @@
                                      AccessSemantics semantics) {
     if (node.operator.lexeme != '=') {
       return giveUp(node, 'Assignment operator: ${node.operator.lexeme}');
     }
     analyzer.Element element = semantics.element;
     dart2js.Element target = converter.convertElement(element);
     // TODO(johnniwinther): Selector information should be computed in the
     // [TreeShaker] and shared with the [CpsGeneratingVisitor].
     assert(invariant(node, target.isTopLevel || target.isStatic,
                      '$target expected to be top-level or static.'));
-    return irBuilder.buildStaticSet(target, build(node.rightHandSide));
+    return irBuilder.buildStaticFieldSet(target, build(node.rightHandSide));
   }
 
   @override
   ir.Node visitDynamicAccess(AstNode node, AccessSemantics semantics) {
     // TODO(johnniwinther): Handle implicit `this`.
     ir.Primitive receiver = build(semantics.target);
     return irBuilder.buildDynamicGet(receiver,
         new Selector.getter(semantics.identifier.name,
                             converter.convertElement(element.library)));
   }
 
   @override
   ir.Node visitStaticFieldAccess(AstNode node, AccessSemantics semantics) {
     analyzer.Element element = semantics.element;
     dart2js.Element target = converter.convertElement(element);
     // TODO(johnniwinther): Selector information should be computed in the
     // [TreeShaker] and shared with the [CpsGeneratingVisitor].
     assert(invariant(node, target.isTopLevel || target.isStatic,
                      '$target expected to be top-level or static.'));
-    return irBuilder.buildStaticGet(target);
+    return irBuilder.buildStaticFieldGet(target);
   }
 
   ir.Primitive handleBinaryExpression(BinaryExpression node,
                                       String op) {
     ir.Primitive left = build(node.leftOperand);
     ir.Primitive right = build(node.rightOperand);
     Selector selector = new Selector.binaryOperator(op);
     return irBuilder.buildDynamicInvocation(
         left, selector, <ir.Primitive>[right]);
   }
@@ skipping 158 matching lines @@
     irBuilder.buildTry(
         tryStatementInfo: new TryStatementInfo(),
         buildTryBlock: subbuild(node.body),
         catchClauseInfos: catchClauseInfos);
   }
 }
 
 class NullCapturedVariables extends DartCapturedVariables {
   NullCapturedVariables() : super(null);
 }