Use an explicit 'this' parameter instead of 'This' nodes.

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 201 matching lines @@
   final List<JumpCollector> breakCollectors = <JumpCollector>[];
 
   /// A stack of collectors for continues.
   final List<JumpCollector> continueCollectors = <JumpCollector>[];
 
   final List<ConstDeclaration> localConstants = <ConstDeclaration>[];
 
   final ExecutableElement currentElement;
 
   final ir.Continuation returnContinuation = new ir.Continuation.retrn();
+  ir.Parameter _thisParameter;
 
   final List<ir.Definition> functionParameters = <ir.Definition>[];
 
   IrBuilderDelimitedState(this.constantSystem, this.currentElement);
+
+  ir.Parameter get thisParameter => _thisParameter;
+  void set thisParameter(ir.Parameter value) {
+    assert(_thisParameter == null);
+    _thisParameter = value;
+  }
+}
+
+class ThisLocal implements Local {
+  final ExecutableElement executableContext;
+  ThisLocal(this.executableContext);
+  String get name => 'this';
+  toString() => 'ThisLocal($executableContext)';
 }

[asgerf, 2015/03/18 13:28:25]

There is already a ThisLocal in closure.dart. Can we avoid having both?

[sra1, 2015/03/19 10:42:51]

I kept this one (but renamed).
The other one has getEnclosingClass which we don't need.

 
 /// A factory for building the cps IR.
 ///
 /// [DartIrBuilder] and [JsIrBuilder] implement nested functions and captured
 /// variables in different ways.
 abstract class IrBuilder {
   IrBuilder _makeInstance();
 
   // TODO(johnniwinther): Remove this from the [IrBuilder].
   /// A map from TryStatements in the AST to their analysis information.
@@ skipping 52 matching lines @@
   void _enterForLoopBody(ClosureScope scope,
                          List<LocalElement> loopVariables);
 
   /// Called before building the update of a for-loop.
   void _enterForLoopUpdate(ClosureScope scope,
                            List<LocalElement> loopVariables);
 
   /// Add the given function parameter to the IR, and bind it in the environment
   /// or put it in its box, if necessary.
   void _createFunctionParameter(ParameterElement parameterElement);
+  void _createThisParameter();
 
   /// Creates an access to the receiver from the current (or enclosing) method.
   ///
   /// If inside a closure class, [buildThis] will redirect access through
   /// closure fields in order to access the receiver from the enclosing method.
   ir.Primitive buildThis();
 
   // TODO(johnniwinther): Make these field final and remove the default values
   // when [IrBuilder] is a property of [IrBuilderVisitor] instead of a mixin.
 
@@ skipping 88 matching lines @@
 
   void buildFieldInitializerHeader({ClosureScope closureScope}) {
     _enterScope(closureScope);
   }
 
   List<ir.Primitive> buildFunctionHeader(Iterable<ParameterElement> parameters,
                                         {ClosureScope closureScope,
                                          ClosureEnvironment env}) {
     _enterClosureEnvironment(env);
     _enterScope(closureScope);
+    _createThisParameter();
     parameters.forEach(_createFunctionParameter);
     return _parameters;
   }
 
   /// Creates a parameter for [local] and adds it to the current environment.
   ir.Parameter createLocalParameter(Local local) {
     ir.Parameter parameter = new ir.Parameter(local);
     _parameters.add(parameter);
     environment.extend(local, parameter);
     return parameter;
@@ skipping 234 matching lines @@
   ir.FunctionDefinition makeFunctionDefinition(
       List<ConstantExpression> defaults) {
     FunctionElement element = state.currentElement;
     if (element.isAbstract || element.isExternal) {
       assert(invariant(element, _root == null,
           message: "Non-empty body for abstract method $element: $_root"));
       assert(invariant(element, state.localConstants.isEmpty,
           message: "Local constants for abstract method $element: "
                    "${state.localConstants}"));
       return new ir.FunctionDefinition.abstract(
-                element, state.functionParameters, defaults);
+          element, state.thisParameter, state.functionParameters, defaults);
     } else {
       ir.RunnableBody body = makeRunnableBody();
       return new ir.FunctionDefinition(
-          element, state.functionParameters, body,
+          element, state.thisParameter, state.functionParameters, body,
           state.localConstants, defaults);
     }
   }
 
   /// Create a constructor definition without a body, for representing
   /// external constructors declarations.
   ir.ConstructorDefinition makeAbstractConstructorDefinition(
       List<ConstantExpression> defaults) {
     FunctionElement element = state.currentElement;
     assert(invariant(element, _root == null,
         message: "Non-empty body for external constructor $element: $_root"));
     assert(invariant(element, state.localConstants.isEmpty,
         message: "Local constants for external constructor $element: "
                  "${state.localConstants}"));
     return new ir.ConstructorDefinition.abstract(
         element, state.functionParameters, defaults);
   }
 
   ir.ConstructorDefinition makeConstructorDefinition(
       List<ConstantExpression> defaults, List<ir.Initializer> initializers) {
     FunctionElement element = state.currentElement;
     ir.RunnableBody body = makeRunnableBody();
     return new ir.ConstructorDefinition(
-        element, state.functionParameters, body, initializers,
+        element, state.thisParameter, state.functionParameters, body, initializers,
         state.localConstants, defaults);
   }
 
   /// 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(Element target,
                                     Selector selector,
                                     List<ir.Primitive> arguments);
 
@@ skipping 1330 matching lines @@
     ir.Parameter parameter = new ir.Parameter(parameterElement);
     _parameters.add(parameter);
     if (isInMutableVariable(parameterElement)) {
       state.functionParameters.add(getMutableVariable(parameterElement));
     } else {
       state.functionParameters.add(parameter);
       environment.extend(parameterElement, parameter);
     }
   }
 
+  void _createThisParameter() {
+    if (state.currentElement.isGenerativeConstructor ||
+        !Elements.isStaticOrTopLevel(state.currentElement)) {

[asgerf, 2015/03/18 13:28:25]

I think this will also create a this parameter for functions nested inside a
static method (because the nested function is not considered static).

[sra1, 2015/03/19 10:42:51]

Done.

+      state.thisParameter =
+          new ir.Parameter(new ThisLocal(state.currentElement));
+    }
+  }
+
   void declareLocalVariable(LocalVariableElement variableElement,
                             {ir.Primitive initialValue}) {
     assert(isOpen);
     if (initialValue == null) {
       initialValue = buildNullLiteral();
     }
     if (isInMutableVariable(variableElement)) {
       add(new ir.LetMutable(getMutableVariable(variableElement),
                             initialValue));
     } else {
@@ skipping 45 matching lines @@
     if (isInMutableVariable(local)) {
       add(new ir.SetMutableVariable(getMutableVariable(local), value));
     } else {
       value.useElementAsHint(local);
       environment.update(local, value);
     }
     return value;
   }
 
   ir.Primitive buildThis() {
-    ir.Primitive thisPrim = new ir.This();
-    add(new ir.LetPrim(thisPrim));
-    return thisPrim;
+    return state.thisParameter;
   }
 
   ir.Primitive buildSuperInvocation(Element target,
                                     Selector selector,
                                     List<ir.Primitive> arguments) {
     return _buildInvokeSuper(target, selector, arguments);
   }
 
 }
 
@@ skipping 27 matching lines @@
   Map<ast.TryStatement, TryStatementInfo> get tryStatements => null;
   Set<Local> get mutableCapturedVariables => null;
   bool isInMutableVariable(Local local) => false;
   void makeMutableVariable(Local local) {}
   void removeMutableVariable(Local local) {}
 
   void _enterClosureEnvironment(ClosureEnvironment env) {
     if (env == null) return;
 
     // Obtain a reference to the function object (this).
-    ir.Primitive thisPrim = new ir.This();
-    add(new ir.LetPrim(thisPrim));
+    ir.Parameter thisPrim = state.thisParameter;
 
     // Obtain access to the free variables.
     env.freeVariables.forEach((Local local, ClosureLocation location) {
       if (location.isBox) {
         // Boxed variables are loaded from their box on-demand.
         jsState.boxedVariables[local] = location;
       } else {
         // Unboxed variables are loaded from the function object immediately.
         // This includes BoxLocals which are themselves unboxed variables.
         ir.Primitive load = new ir.GetField(thisPrim, location.field);
@@ skipping 42 matching lines @@
     ClosureLocation location = jsState.boxedVariables[parameterElement];
     if (location != null) {
       add(new ir.SetField(environment.lookup(location.box),
                           location.field,
                           parameter));
     } else {
       environment.extend(parameterElement, parameter);
     }
   }
 
+  void _createThisParameter() {
+    if (!Elements.isStaticOrTopLevel(state.currentElement)) {
+      state.thisParameter =
+          new ir.Parameter(new ThisLocal(state.currentElement));
+    }
+  }
+
   void declareLocalVariable(LocalElement variableElement,
                             {ir.Primitive initialValue}) {
     assert(isOpen);
     if (initialValue == null) {
       initialValue = buildNullLiteral();
     }
     ClosureLocation location = jsState.boxedVariables[variableElement];
     if (location != null) {
       add(new ir.SetField(environment.lookup(location.box),
                           location.field,
                           initialValue));
     } else {
       initialValue.useElementAsHint(variableElement);
       environment.extend(variableElement, initialValue);
     }
   }
 
   /// Add [functionElement] to the environment with provided [definition].
   void declareLocalFunction(LocalFunctionElement functionElement,
                             ClosureClassElement classElement) {
     ir.Primitive closure = buildFunctionExpression(classElement);
     declareLocalVariable(functionElement, initialValue: closure);
   }
 
   ir.Primitive buildFunctionExpression(ClosureClassElement classElement) {
     List<ir.Primitive> arguments = <ir.Primitive>[];
     for (ClosureFieldElement field in classElement.closureFields) {
       // Captured 'this' is not available as a local in the current environment,
       // so treat that specially.
       ir.Primitive value = field.local is ThisLocal

[asgerf, 2015/03/18 13:28:25]

I suspect this doesn't work anymore because of the new ThisLocal class.

[sra1, 2015/03/19 10:42:51]

Good catch.  I just debugged that :-)

           ? buildThis()
           : environment.lookup(field.local);
       arguments.add(value);
     }
     ir.Primitive closure = new ir.CreateInstance(classElement, arguments);
     add(new ir.LetPrim(closure));
     return closure;
   }
 
   /// Create a read access of [local].
@@ skipping 58 matching lines @@
       ClosureLocation location = scope.capturedVariables[loopVar];
       ir.Primitive get = new ir.GetField(box, location.field);
       add(new ir.LetPrim(get));
       add(new ir.SetField(newBox, location.field, get));
     }
     environment.update(scope.box, newBox);
   }
 
   ir.Primitive buildThis() {
     if (jsState.receiver != null) return jsState.receiver;
-    ir.Primitive thisPrim = new ir.This();
-    add(new ir.LetPrim(thisPrim));
-    return thisPrim;
+    return state.thisParameter;
   }
 
   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.
@@ skipping 23 matching lines @@
             receiver, target, selector, k, arguments));
   }
 
   /// Loads parameters to a constructor body into the environment.
   ///
   /// The header for a constructor body differs from other functions in that
   /// some parameters are already boxed, and the box is passed as an argument
   /// instead of being created in the header.
   void buildConstructorBodyHeader(Iterable<Local> parameters,
                                   ClosureScope closureScope) {
+    _createThisParameter();
     for (Local param in parameters) {
       ir.Parameter parameter = createLocalParameter(param);
       state.functionParameters.add(parameter);
     }
     if (closureScope != null) {
       jsState.boxedVariables.addAll(closureScope.capturedVariables);
     }
   }
 }
 
@@ skipping 59 matching lines @@
 // TODO(johnniwinther): Support passing of [DartType] for the exception.
 class CatchClauseInfo {
   final LocalVariableElement exceptionVariable;
   final LocalVariableElement stackTraceVariable;
   final SubbuildFunction buildCatchBlock;
 
   CatchClauseInfo({this.exceptionVariable,
                    this.stackTraceVariable,
                    this.buildCatchBlock});
 }