| 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 295edffe2475c57c3b6047b41f023a8d425f5aca..234df38d0b10050704f2c13c8dd9e6befc941364 100644
|
| --- a/pkg/compiler/lib/src/cps_ir/type_propagation.dart
|
| +++ b/pkg/compiler/lib/src/cps_ir/type_propagation.dart
|
| @@ -93,7 +93,7 @@ class TypeMaskSystem implements TypeSystem<TypeMask> {
|
| * Implemented according to 'Constant Propagation with Conditional Branches'
|
| * by Wegman, Zadeck.
|
| */
|
| -class TypePropagator<T> extends PassMixin {
|
| +class TypePropagator<T> extends Pass {
|
| String get passName => 'Sparse constant propagation';
|
|
|
| final types.DartTypes _dartTypes;
|
| @@ -112,7 +112,9 @@ class TypePropagator<T> extends PassMixin {
|
| : _types = <Node, _AbstractValue>{};
|
|
|
| @override
|
| - void rewriteExecutableDefinition(ExecutableDefinition root) {
|
| + void rewrite(RootNode root) {
|
| + if (root.isEmpty) return;
|
| +
|
| // Set all parent pointers.
|
| new ParentVisitor().visit(root);
|
|
|
| @@ -150,7 +152,7 @@ class _TransformingVisitor extends RecursiveVisitor {
|
|
|
| _TransformingVisitor(this.reachable, this.values, this.internalError);
|
|
|
| - void transform(ExecutableDefinition root) {
|
| + void transform(RootNode root) {
|
| visit(root);
|
| }
|
|
|
| @@ -347,7 +349,7 @@ class _TypePropagationVisitor<T> implements Visitor {
|
| new _AbstractValue<T>.unknown(typeSystem.dynamicType),
|
| this.typeSystem = typeSystem;
|
|
|
| - void analyze(ExecutableDefinition root) {
|
| + void analyze(RootNode root) {
|
| reachableNodes.clear();
|
| defWorkset.clear();
|
| nodeWorklist.clear();
|
| @@ -417,9 +419,7 @@ class _TypePropagationVisitor<T> implements Visitor {
|
| void visit(Node node) { node.accept(this); }
|
|
|
| void visitFieldDefinition(FieldDefinition node) {
|
| - if (node.hasInitializer) {
|
| - setReachable(node.body);
|
| - }
|
| + setReachable(node.body);
|
| }
|
|
|
| void visitFunctionDefinition(FunctionDefinition node) {
|
| @@ -436,7 +436,7 @@ class _TypePropagationVisitor<T> implements Visitor {
|
| setReachable(node.body);
|
| }
|
|
|
| - void visitRunnableBody(RunnableBody node) {
|
| + void visitBody(Body node) {
|
| setReachable(node.body);
|
| }
|
|
|
| @@ -747,7 +747,7 @@ class _TypePropagationVisitor<T> implements Visitor {
|
| void visitMutableVariable(MutableVariable node) {
|
| // [MutableVariable]s are bound either as parameters to
|
| // [FunctionDefinition]s, by [LetMutable], or by [DeclareFunction].
|
| - if (node.parent is FunctionDefinition) {
|
| + if (node.parent is RootNode) {
|
| // Just like immutable parameters, the values of mutable parameters are
|
| // never constant.
|
| // TODO(karlklose): remove reference to the element model.
|
| @@ -769,7 +769,7 @@ class _TypePropagationVisitor<T> implements Visitor {
|
| // TODO(karlklose): remove reference to the element model.
|
| T type = (source is ParameterElement) ? typeSystem.getParameterType(source)
|
| : typeSystem.dynamicType;
|
| - if (node.parent is FunctionDefinition) {
|
| + if (node.parent is RootNode) {
|
| // Functions may escape and thus their parameters must be non-constant.
|
| setValue(node, nonConst(type));
|
| } else if (node.parent is Continuation) {
|
|
|