| Index: pkg/compiler/lib/src/cps_ir/type_propagation.dart
|
| diff --git a/pkg/compiler/lib/src/cps_ir/type_propagation.dart b/pkg/compiler/lib/src/cps_ir/type_propagation.dart
|
| index ffb61e3932c155b4d21de27508f8736b8e25b141..cb776a5eccd1a8a4398658f401004b30700de6f8 100644
|
| --- a/pkg/compiler/lib/src/cps_ir/type_propagation.dart
|
| +++ b/pkg/compiler/lib/src/cps_ir/type_propagation.dart
|
| @@ -2,7 +2,7 @@
|
| // 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.
|
|
|
| -part of dart2js.optimizers;
|
| +part of dart2js.cps_ir.optimizers;
|
|
|
| abstract class TypeSystem<T> {
|
| T get dynamicType;
|
| @@ -81,7 +81,7 @@ typedef void InternalErrorFunction(Spannable location, String message);
|
| * Implemented according to 'Constant Propagation with Conditional Branches'
|
| * by Wegman, Zadeck.
|
| */
|
| -class TypePropagator<T> extends Pass {
|
| +class TypePropagator<T> extends PassMixin {
|
| // TODO(karlklose): remove reference to _compiler. It is currently used to
|
| // compute [TypeMask]s.
|
| final dart2js.Compiler _compiler;
|
| @@ -100,7 +100,8 @@ class TypePropagator<T> extends Pass {
|
| this._internalError)
|
| : _types = <Node, _AbstractValue>{};
|
|
|
| - void _rewriteExecutableDefinition(ExecutableDefinition root) {
|
| + @override
|
| + void rewriteExecutableDefinition(ExecutableDefinition root) {
|
| // Set all parent pointers.
|
| new ParentVisitor().visit(root);
|
|
|
| @@ -123,16 +124,6 @@ class TypePropagator<T> extends Pass {
|
| transformer.transform(root);
|
| }
|
|
|
| - void rewriteFunctionDefinition(FunctionDefinition root) {
|
| - if (root.isAbstract) return;
|
| - _rewriteExecutableDefinition(root);
|
| - }
|
| -
|
| - void rewriteFieldDefinition(FieldDefinition root) {
|
| - if (!root.hasInitializer) return;
|
| - _rewriteExecutableDefinition(root);
|
| - }
|
| -
|
| getType(Node node) => _types[node];
|
| }
|
|
|
| @@ -415,6 +406,10 @@ class _ConstPropagationVisitor<T> extends Visitor {
|
| "_ConstPropagationVisitor is stale, add missing visit overrides");
|
| }
|
|
|
| + void visitRunnableBody(RunnableBody node) {
|
| + setReachable(node.body);
|
| + }
|
| +
|
| void visitFunctionDefinition(FunctionDefinition node) {
|
| node.parameters.forEach(visit);
|
| setReachable(node.body);
|
|
|