| Index: pkg/compiler/lib/src/dart_backend/copy_propagator.dart
|
| diff --git a/pkg/compiler/lib/src/dart_backend/copy_propagator.dart b/pkg/compiler/lib/src/dart_backend/copy_propagator.dart
|
| deleted file mode 100644
|
| index 71157968444ed80efc8497ec6edf158e39904db2..0000000000000000000000000000000000000000
|
| --- a/pkg/compiler/lib/src/dart_backend/copy_propagator.dart
|
| +++ /dev/null
|
| @@ -1,199 +0,0 @@
|
| -// 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 copy_propagator;
|
| -
|
| -import '../elements/elements.dart';
|
| -import 'tree_ir_nodes.dart';
|
| -
|
| -/// Eliminates moving assignments, such as w := v, by assigning directly to w
|
| -/// at the definition of v.
|
| -///
|
| -/// This compensates for suboptimal register allocation, and merges closure
|
| -/// variables with local temporaries that were left behind when translating
|
| -/// out of CPS (where closure variables live in a separate space).
|
| -class CopyPropagator extends RecursiveVisitor {
|
| -
|
| - /// After visitStatement returns, [move] maps a variable v to an
|
| - /// assignment A of form w := v, under the following conditions:
|
| - /// - there are no uses of w before A
|
| - /// - A is the only use of v
|
| - Map<Variable, Assign> move = <Variable, Assign>{};
|
| -
|
| - /// Like [move], except w is the key instead of v.
|
| - Map<Variable, Assign> inverseMove = <Variable, Assign>{};
|
| -
|
| - /// The function currently being rewritten.
|
| - FunctionElement functionElement;
|
| -
|
| - void rewrite(FunctionDefinition function) {
|
| - if (function.isAbstract) return;
|
| -
|
| - functionElement = function.element;
|
| - visitFunctionDefinition(function);
|
| - }
|
| -
|
| - void visitFunctionDefinition(FunctionDefinition function) {
|
| - assert(functionElement == function.element);
|
| - function.body = visitStatement(function.body);
|
| -
|
| - // Try to propagate moving assignments into function parameters.
|
| - // For example:
|
| - // foo(x) {
|
| - // var v1 = x;
|
| - // BODY
|
| - // }
|
| - // ==>
|
| - // foo(v1) {
|
| - // BODY
|
| - // }
|
| -
|
| - // Variables must not occur more than once in the parameter list, so
|
| - // invalidate all moving assignments that would propagate a parameter
|
| - // into another parameter. For example:
|
| - // foo(x,y) {
|
| - // y = x;
|
| - // BODY
|
| - // }
|
| - // Cannot declare function as foo(x,x)!
|
| - function.parameters.forEach(visitVariable);
|
| -
|
| - // Now do the propagation.
|
| - for (int i=0; i<function.parameters.length; i++) {
|
| - Variable param = function.parameters[i];
|
| - Variable replacement = copyPropagateVariable(param);
|
| - replacement.element = param.element; // Preserve parameter name.
|
| - function.parameters[i] = replacement;
|
| - }
|
| - }
|
| -
|
| - Statement visitBasicBlock(Statement node) {
|
| - node = visitStatement(node);
|
| - move.clear();
|
| - inverseMove.clear();
|
| - return node;
|
| - }
|
| -
|
| - void visitVariable(Variable variable) {
|
| - // We have found a use of w.
|
| - // Remove assignments of form w := v from the move maps.
|
| - Assign movingAssignment = inverseMove.remove(variable);
|
| - if (movingAssignment != null) {
|
| - move.remove(movingAssignment.definition);
|
| - }
|
| - }
|
| -
|
| - /**
|
| - * Called when a definition of [v] is encountered.
|
| - * Attempts to propagate the assignment through a moving assignment.
|
| - * Returns the variable to be assigned into, defaulting to [v] itself if
|
| - * no optimization could be performed.
|
| - */
|
| - Variable copyPropagateVariable(Variable v) {
|
| - Assign movingAssign = move[v];
|
| - if (movingAssign != null) {
|
| - // We found the pattern:
|
| - // v := EXPR
|
| - // BLOCK (does not use w)
|
| - // w := v (only use of v)
|
| - //
|
| - // Rewrite to:
|
| - // w := EXPR
|
| - // BLOCK
|
| - // w := w (to be removed later)
|
| - Variable w = movingAssign.variable;
|
| -
|
| - // Make w := w.
|
| - // We can't remove the statement from here because we don't have
|
| - // parent pointers. So just make it a no-op so it can be removed later.
|
| - movingAssign.definition = w;
|
| -
|
| - // The intermediate variable 'v' should now be orphaned, so don't bother
|
| - // updating its read/write counters.
|
| - // Due to the nop trick, the variable 'w' now has one additional read
|
| - // and write.
|
| - ++w.writeCount;
|
| - ++w.readCount;
|
| -
|
| - // Make w := EXPR
|
| - return w;
|
| - }
|
| - return v;
|
| - }
|
| -
|
| - Statement visitAssign(Assign node) {
|
| - node.next = visitStatement(node.next);
|
| - node.variable = copyPropagateVariable(node.variable);
|
| - visitExpression(node.definition);
|
| - visitVariable(node.variable);
|
| -
|
| - // If this is a moving assignment w := v, with this being the only use of v,
|
| - // try to propagate it backwards. Do not propagate assignments where w
|
| - // is from an outer function scope.
|
| - if (node.definition is Variable) {
|
| - Variable def = node.definition;
|
| - if (def.readCount == 1 &&
|
| - node.variable.host.element == functionElement) {
|
| - move[node.definition] = node;
|
| - inverseMove[node.variable] = node;
|
| - }
|
| - }
|
| -
|
| - return node;
|
| - }
|
| -
|
| - Statement visitLabeledStatement(LabeledStatement node) {
|
| - node.next = visitBasicBlock(node.next);
|
| - node.body = visitStatement(node.body);
|
| - return node;
|
| - }
|
| -
|
| - Statement visitReturn(Return node) {
|
| - visitExpression(node.value);
|
| - return node;
|
| - }
|
| -
|
| - Statement visitBreak(Break node) {
|
| - return node;
|
| - }
|
| -
|
| - Statement visitContinue(Continue node) {
|
| - return node;
|
| - }
|
| -
|
| - Statement visitIf(If node) {
|
| - visitExpression(node.condition);
|
| - node.thenStatement = visitBasicBlock(node.thenStatement);
|
| - node.elseStatement = visitBasicBlock(node.elseStatement);
|
| - return node;
|
| - }
|
| -
|
| - Statement visitWhileTrue(WhileTrue node) {
|
| - node.body = visitBasicBlock(node.body);
|
| - return node;
|
| - }
|
| -
|
| - Statement visitWhileCondition(WhileCondition node) {
|
| - throw "WhileCondition before LoopRewriter";
|
| - }
|
| -
|
| - Statement visitFunctionDeclaration(FunctionDeclaration node) {
|
| - // Unlike var declarations, function declarations are not hoisted, so we
|
| - // can't do copy propagation of the variable.
|
| - new CopyPropagator().rewrite(node.definition);
|
| - node.next = visitStatement(node.next);
|
| - return node;
|
| - }
|
| -
|
| - Statement visitExpressionStatement(ExpressionStatement node) {
|
| - node.next = visitStatement(node.next);
|
| - visitExpression(node.expression);
|
| - return node;
|
| - }
|
| -
|
| - void visitFunctionExpression(FunctionExpression node) {
|
| - new CopyPropagator().rewrite(node.definition);
|
| - }
|
| -
|
| -}
|
|
|