| Index: tests/compiler/dart2js/backend_dart/opt_constprop_test.dart
|
| diff --git a/tests/compiler/dart2js/backend_dart/opt_constprop_test.dart b/tests/compiler/dart2js/backend_dart/opt_constprop_test.dart
|
| index cb158e78ca66500929533aeb7c3342f90f31448a..bd989ef589f079f9f78c132d84be45e01f2eb919 100644
|
| --- a/tests/compiler/dart2js/backend_dart/opt_constprop_test.dart
|
| +++ b/tests/compiler/dart2js/backend_dart/opt_constprop_test.dart
|
| @@ -395,6 +395,25 @@ String normalizeSExpr(String input) {
|
| return input.replaceAll(new RegExp(r'[ \n\t]+'), ' ').trim();
|
| }
|
|
|
| +class UnitTypeSystem implements TypeSystem<String> {
|
| + static const String UNIT = 'unit';
|
| +
|
| + get boolType => UNIT;
|
| + get dynamicType => UNIT;
|
| + get functionType => UNIT;
|
| + get intType => UNIT;
|
| + get listType => UNIT;
|
| + get mapType => UNIT;
|
| + get stringType => UNIT;
|
| + get typeType => UNIT;
|
| +
|
| + bool areAssignable(a, b) => true;
|
| + getParameterType(_) => UNIT;
|
| + getReturnType(_) => UNIT;
|
| + join(a, b) => UNIT;
|
| + typeOf(_) => UNIT;
|
| +}
|
| +
|
| /// Parses the given input IR, runs an optimization pass over it, and compares
|
| /// the stringification of the result against the expected output.
|
| Future testConstantPropagator(String input, String expectedOutput) {
|
| @@ -404,8 +423,11 @@ Future testConstantPropagator(String input, String expectedOutput) {
|
| return compiler.init().then((_) {
|
| final unstringifier = new SExpressionUnstringifier();
|
| final stringifier = new SExpressionStringifier();
|
| - final optimizer = new ConstantPropagator(
|
| - compiler, dart2js.DART_CONSTANT_SYSTEM);
|
| + final optimizer = new TypePropagator(
|
| + compiler,
|
| + dart2js.DART_CONSTANT_SYSTEM,
|
| + new UnitTypeSystem(),
|
| + compiler.internalError);
|
|
|
| final f = unstringifier.unstringify(input);
|
| optimizer.rewrite(f);
|
|
|