| Index: sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart b/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart
|
| index caf530dcc2873c336ea90df4f497d30f32083d23..5cf7f0459563b5753420aec785d7b92dcff4c882 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/cps_ir/cps_ir_nodes.dart
|
| @@ -7,7 +7,7 @@
|
| library dart2js.ir_nodes;
|
|
|
| import '../constants/expressions.dart';
|
| -import '../constants/values.dart' as values show Constant;
|
| +import '../constants/values.dart' as values show ConstantValue;
|
| import '../dart2jslib.dart' as dart2js show invariant;
|
| import '../elements/elements.dart';
|
| import '../universe/universe.dart' show Selector, SelectorKind;
|
| @@ -449,11 +449,11 @@ class Branch extends Expression {
|
| }
|
|
|
| class Constant extends Primitive {
|
| - final ConstExp expression;
|
| + final ConstantExpression expression;
|
|
|
| Constant(this.expression);
|
|
|
| - values.Constant get value => expression.value;
|
| + values.ConstantValue get value => expression.value;
|
|
|
| accept(Visitor visitor) => visitor.visitConstant(this);
|
| }
|
| @@ -471,7 +471,7 @@ class ReifyTypeVar extends Primitive {
|
|
|
| ReifyTypeVar(this.typeVariable);
|
|
|
| - values.Constant get constant => null;
|
| + values.ConstantValue get constant => null;
|
|
|
| accept(Visitor visitor) => visitor.visitReifyTypeVar(this);
|
| }
|
| @@ -545,7 +545,7 @@ class FunctionDefinition extends Node implements InteriorNode {
|
| final List<ConstDeclaration> localConstants;
|
|
|
| /// Values for optional parameters.
|
| - final List<ConstExp> defaultParameterValues;
|
| + final List<ConstantExpression> defaultParameterValues;
|
|
|
| FunctionDefinition(this.element, this.returnContinuation,
|
| this.parameters, this.body, this.localConstants,
|
|
|