Handle super-method invocations in CPS->JS backend.

pkg/compiler/lib/src/cps_ir/cps_ir_builder.dart

 // Copyright (c) 2013, 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 dart2js.ir_builder;
 
 import '../constants/expressions.dart';
 import '../constants/values.dart' show PrimitiveConstantValue;
 import '../dart_types.dart';
 import '../dart2jslib.dart';
@@ skipping 382 matching lines @@
   }
 
   ir.Primitive _buildInvokeStatic(Element element,
                                   Selector selector,
                                   List<ir.Primitive> arguments) {
     assert(isOpen);
     return _continueWithExpression(
         (k) => new ir.InvokeStatic(element, selector, k, arguments));
   }
 
-  ir.Primitive _buildInvokeSuper(Selector selector,
-                                 List<ir.Primitive> arguments) {
+  ir.Primitive _buildInvokeDirectly(Element target,
+                                    Selector selector,
+                                    List<ir.Primitive> arguments) {
     assert(isOpen);
     return _continueWithExpression(
-        (k) => new ir.InvokeSuperMethod(selector, k, arguments));
+        (k) => new ir.InvokeMethodDirectly(
+            buildThis(), target, selector, k, arguments));
   }
 
   ir.Primitive _buildInvokeDynamic(ir.Primitive receiver,
                                    Selector selector,
                                    List<ir.Primitive> arguments) {
     assert(isOpen);
     return _continueWithExpression(
         (k) => new ir.InvokeMethod(receiver, selector, k, arguments));
   }
 
@@ skipping 207 matching lines @@
     ir.RunnableBody body = makeRunnableBody();
     return new ir.ConstructorDefinition(
         element, state.functionParameters, body, initializers,
         state.localConstants, defaults,
         _getDeclaredClosureVariables(element));
   }
 
   /// Create a super invocation where the method name and the argument structure
   /// are defined by [selector] and the argument values are defined by
   /// [arguments].
-  ir.Primitive buildSuperInvocation(Selector selector,
-                                    List<ir.Primitive> arguments) {
-    return _buildInvokeSuper(selector, arguments);
-  }
-
-  /// Create a getter invocation on the super class where the getter name is
-  /// defined by [selector].
-  ir.Primitive buildSuperGet(Selector selector) {
-    assert(selector.isGetter);
-    return _buildInvokeSuper(selector, const <ir.Primitive>[]);
-  }
+  ir.Primitive buildSuperInvocation(Element target,
+                                    Selector selector,
+                                    List<ir.Primitive> arguments);
 
   /// Create a setter invocation on the super class where the setter name and
   /// argument are defined by [selector] and [value], respectively.
-  ir.Primitive buildSuperSet(Selector selector, ir.Primitive value) {
-    assert(selector.isSetter);
-    _buildInvokeSuper(selector, <ir.Primitive>[value]);
-    return value;
+  void buildSuperSet(Element target, Selector selector, ir.Primitive value) {
+    buildSuperInvocation(target, selector, [value]);
   }
 
   /// Create an index set invocation on the super class with the provided
   /// [index] and [value].
-  ir.Primitive buildSuperIndexSet(ir.Primitive index,
+  ir.Primitive buildSuperIndexSet(Element target,
+                                  ir.Primitive index,
                                   ir.Primitive value) {
-    _buildInvokeSuper(new Selector.indexSet(), <ir.Primitive>[index, value]);
+    _buildInvokeDirectly(target, new Selector.indexSet(),
+        <ir.Primitive>[index, value]);
     return value;
   }
 
   /// Create a dynamic invocation on [receiver] where the method name and
   /// argument structure are defined by [selector] and the argument values are
   /// defined by [arguments].
   ir.Primitive buildDynamicInvocation(ir.Primitive receiver,
                                       Selector selector,
                                       List<ir.Primitive> arguments) {
     return _buildInvokeDynamic(receiver, selector, arguments);
@@ skipping 1054 matching lines @@
       ExecutableElement element) {
     return dartState.getClosureList(element);
   }
 
   ir.Primitive buildThis() {
     ir.Primitive thisPrim = new ir.This();
     add(new ir.LetPrim(thisPrim));
     return thisPrim;
   }
 
+  ir.Primitive buildSuperInvocation(Element target,
+                                    Selector selector,
+                                    List<ir.Primitive> arguments) {
+    return _buildInvokeDirectly(target, selector, arguments);
+  }
+
 }
 
 /// State shared between JsIrBuilders within the same function.
 ///
 /// Note that this is not shared between builders of nested functions.
 class JsIrBuilderSharedState {
   /// Maps boxed locals to their location. These locals are not part of
   /// the environment.
   final Map<Local, ClosureLocation> boxedVariables = {};
 
@@ skipping 182 matching lines @@
       ExecutableElement element) {
     return <ir.ClosureVariable>[];
   }
 
   ir.Primitive buildThis() {
     if (jsState.receiver != null) return jsState.receiver;
     ir.Primitive thisPrim = new ir.This();
     add(new ir.LetPrim(thisPrim));
     return thisPrim;
   }
+
+  ir.Primitive buildSuperInvocation(Element target,
+                                    Selector selector,
+                                    List<ir.Primitive> arguments) {
+    // Direct calls to FieldElements are currently problematic because the
+    // backend will not issue a getter for the field unless it finds a dynamic
+    // access that matches its getter.
+    // As a workaround, we generate GetField for this case, although ideally
+    // this should be the result of inlining the field's getter.
+    if (target is FieldElement) {
+      if (selector.isGetter) {
+        ir.Primitive get = new ir.GetField(buildThis(), target);
+        add(new ir.LetPrim(get));
+        return get;
+      } else {
+        assert(selector.isSetter);
+        add(new ir.SetField(buildThis(), target, arguments.single));
+        return arguments.single;
+      }
+    } else {
+      return _buildInvokeDirectly(target, selector, arguments);
+    }
+  }
 }
 
 
 /// Location of a variable relative to a given closure.
 class ClosureLocation {
   /// If not `null`, this location is [box].[field].
   /// The location of [box] can be obtained separately from an
   /// enclosing [ClosureEnvironment] or [ClosureScope].
   /// If `null`, then the location is [field] on the enclosing function object.
   final BoxLocal box;
@@ skipping 42 matching lines @@
   ClosureEnvironment(this.selfReference, this.thisLocal, this.freeVariables);
 }
 
 /// Information about which variables are captured in a closure.
 ///
 /// This is used by the [DartIrBuilder] instead of [ClosureScope] and
 /// [ClosureEnvironment].
 abstract class ClosureVariableInfo {
   Iterable<Local> get capturedVariables;
 }