[dart2js] Cleanup

Rename DummyInterceptorConstantValue to DummyConstantValue. It was
actually used as a dummy *receiver* argument and could be used against
any unused parameter.

Remove unused CompilerOptions argument in SSA as-checks and is-tests.
Pass the checked input explicitly to facilitate testing on other inputs (e.g. to do partial redundancy elimination by pushing the operation into the arms of a phi.)

Change-Id: I4b450bfcf5fc877de731bf83201e3c9248ffcb0c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433104
Reviewed-by: Mayank Patke <[email protected]>
Commit-Queue: Stephen Adams <[email protected]>

Author: rakudrama

pkg/compiler/lib/src/constants/values.dart

@@ -29,7 +29,7 @@ enum ConstantValueKind {
   interceptor,
   javaScriptObject,
   jsName,
-  dummyInterceptor,
+  dummy,
   lateSentinel,
   unreachable,
   instantiation,
@@ -62,10 +62,7 @@ abstract class ConstantValueVisitor<R, A> {
     covariant JavaScriptObjectConstantValue constant,
     covariant A arg,
   );
-  R visitDummyInterceptor(
-    covariant DummyInterceptorConstantValue constant,
-    covariant A arg,
-  );
+  R visitDummy(covariant DummyConstantValue constant, covariant A arg);
   R visitLateSentinel(
     covariant LateSentinelConstantValue constant,
     covariant A arg,
@@ -826,14 +823,14 @@ class JsNameConstantValue extends ConstantValue {
   }
 }
 
-/// A constant used as the dummy receiver value for intercepted calls with
-/// a known non-interceptor target.
-// TODO(sra): Rename fo 'DummyReceiverConstantValue'.
-class DummyInterceptorConstantValue extends ConstantValue {
-  factory DummyInterceptorConstantValue() =>
-      const DummyInterceptorConstantValue._();
+/// A constant used as an argument or receiver when the target does not use the
+/// corresponding parameter. Used as the dummy receiver value for calls using
+/// the intercepted calling convention when the target is 'self-intercepting'
+/// and does not use the explicit receiver parameter.
+class DummyConstantValue extends ConstantValue {
+  factory DummyConstantValue() => const DummyConstantValue._();
 
-  const DummyInterceptorConstantValue._();
+  const DummyConstantValue._();
 
   @override
   bool get isDummy => true;
@@ -843,20 +840,20 @@ class DummyInterceptorConstantValue extends ConstantValue {
 
   @override
   R accept<R, A>(ConstantValueVisitor<R, A> visitor, A arg) {
-    return visitor.visitDummyInterceptor(this, arg);
+    return visitor.visitDummy(this, arg);
   }
 
   @override
   DartType getType(CommonElements types) => types.dynamicType;
 
   @override
-  ConstantValueKind get kind => ConstantValueKind.dummyInterceptor;
+  ConstantValueKind get kind => ConstantValueKind.dummy;
 
   @override
-  String toDartText(DartTypes? dartTypes) => 'dummy_interceptor()';
+  String toDartText(DartTypes? dartTypes) => 'dummy()';
 
   @override
-  String toStructuredText(DartTypes? dartTypes) => 'DummyInterceptorConstant()';
+  String toStructuredText(DartTypes? dartTypes) => 'DummyConstant()';
 }
 
 /// A constant used to represent the sentinel for uninitialized late fields and

pkg/compiler/lib/src/inferrer/typemasks/constants.dart

@@ -55,7 +55,7 @@ class ConstantValueTypeMasks extends ConstantValueVisitor<TypeMask, Null> {
   }
 
   @override
-  TypeMask visitDummyInterceptor(DummyInterceptorConstantValue constant, _) =>
+  TypeMask visitDummy(DummyConstantValue constant, _) =>
       _abstractValueDomain.dynamicType;
 
   @override

pkg/compiler/lib/src/js_backend/constant_emitter.dart

@@ -162,10 +162,7 @@ class ModularConstantEmitter
   }
 
   @override
-  js_ast.Expression visitDummyInterceptor(
-    DummyInterceptorConstantValue constant, [
-    _,
-  ]) {
+  js_ast.Expression visitDummy(DummyConstantValue constant, [_]) {
     return js_ast.LiteralNumber('0');
   }
 

pkg/compiler/lib/src/js_backend/impact_transformer.dart

@@ -119,7 +119,7 @@ class CodegenImpactTransformer {
           break;
         case ConstantValueKind.bool:
         case ConstantValueKind.double:
-        case ConstantValueKind.dummyInterceptor:
+        case ConstantValueKind.dummy:
         case ConstantValueKind.function:
         case ConstantValueKind.int:
         case ConstantValueKind.interceptor:

pkg/compiler/lib/src/js_backend/namer.dart

@@ -1498,8 +1498,8 @@ class ConstantNamingVisitor implements ConstantValueVisitor<void, Null> {
   }
 
   @override
-  void visitDummyInterceptor(DummyInterceptorConstantValue constant, [_]) {
-    add('dummy_interceptor');
+  void visitDummy(DummyConstantValue constant, [_]) {
+    add('dummy');
   }
 
   @override
@@ -1669,10 +1669,10 @@ class ConstantCanonicalHasher implements ConstantValueVisitor<int, Null> {
   }
 
   @override
-  int visitDummyInterceptor(DummyInterceptorConstantValue constant, [_]) {
+  int visitDummy(DummyConstantValue constant, [_]) {
     throw failedAt(
       noLocationSpannable,
-      'DummyInterceptorConstantValue should never be named and '
+      'DummyConstantValue should never be named and '
       'never be subconstant',
     );
   }

pkg/compiler/lib/src/js_emitter/constant_ordering.dart

@@ -162,11 +162,7 @@ class _ConstantOrdering
   }
 
   @override
-  int visitDummyInterceptor(
-    DummyInterceptorConstantValue a,
-    DummyInterceptorConstantValue b,
-  ) {
-    // Never emitted.
+  int visitDummy(DummyConstantValue a, DummyConstantValue b) {
     return 0;
   }
 

pkg/compiler/lib/src/js_model/js_to_frontend_map.dart

@@ -317,10 +317,7 @@ class _ConstantConverter implements ConstantValueVisitor<ConstantValue, Null> {
   @override
   StringConstantValue visitString(StringConstantValue constant, _) => constant;
   @override
-  DummyInterceptorConstantValue visitDummyInterceptor(
-    DummyInterceptorConstantValue constant,
-    _,
-  ) => constant;
+  DummyConstantValue visitDummy(DummyConstantValue constant, _) => constant;
   @override
   LateSentinelConstantValue visitLateSentinel(
     LateSentinelConstantValue constant,

pkg/compiler/lib/src/serialization/sink.dart

@@ -1021,7 +1021,7 @@ class DataSinkWriter {
         writeConstant(constant.referenced);
         writeOutputUnitReference(constant.unit);
         break;
-      case ConstantValueKind.dummyInterceptor:
+      case ConstantValueKind.dummy:
         break;
       case ConstantValueKind.lateSentinel:
         break;

pkg/compiler/lib/src/serialization/source.dart

@@ -1335,8 +1335,8 @@ class DataSourceReader {
         ConstantValue constant = readConstant();
         OutputUnit unit = readOutputUnitReference();
         return DeferredGlobalConstantValue(constant, unit);
-      case ConstantValueKind.dummyInterceptor:
-        return DummyInterceptorConstantValue();
+      case ConstantValueKind.dummy:
+        return DummyConstantValue();
       case ConstantValueKind.lateSentinel:
         return LateSentinelConstantValue();
       case ConstantValueKind.unreachable:

pkg/compiler/lib/src/ssa/interceptor_finalizer.dart

@@ -269,7 +269,7 @@ class SsaFinalizeInterceptors extends HBaseVisitor<void>
 
   void _replaceReceiverArgumentWithDummy(HInvoke node, int receiverIndex) {
     assert(!node.isCallOnInterceptor, 'node: $node');
-    ConstantValue constant = DummyInterceptorConstantValue();
+    ConstantValue constant = DummyConstantValue();
     HConstant dummy = _graph.addConstant(constant, _closedWorld);
     node.replaceInput(receiverIndex, dummy);
   }

pkg/compiler/lib/src/ssa/nodes.dart

@@ -31,7 +31,6 @@ import '../js_model/js_world.dart' show JClosedWorld;
 import '../js_model/type_recipe.dart'
     show TypeEnvironmentStructure, TypeRecipe, TypeExpressionRecipe;
 import '../native/behavior.dart';
-import '../options.dart';
 import '../universe/selector.dart' show Selector;
 import '../universe/side_effects.dart' show SideEffects;
 import '../util/util.dart';
@@ -1952,9 +1951,7 @@ abstract class HInvoke extends HInstruction
       final receiver = inputs[1].nonCheck();
       if (interceptor == receiver) {
         _isCallOnInterceptor = false;
-      } else if (receiver case HConstant(
-        constant: DummyInterceptorConstantValue(),
-      )) {
+      } else if (receiver case HConstant(constant: DummyConstantValue())) {
         _isCallOnInterceptor = false;
       }
     }
@@ -4542,13 +4539,16 @@ class HIsTest extends HInstruction {
   HInstruction get typeInput => inputs[0];
   HInstruction get checkedInput => inputs[1];
 
-  AbstractBool evaluate(JClosedWorld closedWorld, CompilerOptions options) =>
+  /// Returns the value of the test (true/false/maybe). Pass [this.checkedInput]
+  /// as [input] to evaluate this test in place. [input] is provided as an
+  /// argument so that other inputs can be tested, for example, to test for
+  /// partial redundancy between a phi's inputs.
+  AbstractBool evaluateOn(HInstruction input, JClosedWorld closedWorld) =>
       _typeTest(
-        checkedInput,
+        input,
         dartType,
         checkedAbstractValue,
         closedWorld,
-        options,
         isCast: false,
       );
 
@@ -4587,13 +4587,13 @@ class HIsTestSimple extends HInstruction {
 
   HInstruction get checkedInput => inputs[0];
 
-  AbstractBool evaluate(JClosedWorld closedWorld, CompilerOptions options) =>
+  /// See [HIsTest.evaluateOn].
+  AbstractBool evaluateOn(HInstruction input, JClosedWorld closedWorld) =>
       _typeTest(
-        checkedInput,
+        input,
         dartType,
         checkedAbstractValue,
         closedWorld,
-        options,
         isCast: false,
       );
 
@@ -4617,8 +4617,7 @@ AbstractBool _typeTest(
   HInstruction expression,
   DartType dartType,
   AbstractValueWithPrecision checkedAbstractValue,
-  JClosedWorld closedWorld,
-  CompilerOptions options, {
+  JClosedWorld closedWorld, {
   required bool isCast,
 }) {
   JCommonElements commonElements = closedWorld.commonElements;
@@ -4753,15 +4752,17 @@ class HAsCheck extends HCheck {
     return isTypeError == other.isTypeError;
   }
 
-  bool isRedundant(JClosedWorld closedWorld, CompilerOptions options) =>
-      _typeTest(
-        checkedInput,
-        checkedTypeExpression,
-        checkedType,
-        closedWorld,
-        options,
-        isCast: true,
-      ).isDefinitelyTrue;
+  /// Returns 'true` is the check always passes. Provide [this.checkedInput] as
+  /// [input] to evaluate this check in place. [input] is provided as an
+  /// argument so that other inputs can be tested, for example, to test for
+  /// partial redundancy between a phi's inputs.
+  bool isRedundantOn(HInstruction input, JClosedWorld closedWorld) => _typeTest(
+    input,
+    checkedTypeExpression,
+    checkedType,
+    closedWorld,
+    isCast: true,
+  ).isDefinitelyTrue;
 
   @override
   String toString() {
@@ -4796,15 +4797,14 @@ class HAsCheckSimple extends HCheck {
   @override
   R accept<R>(HVisitor<R> visitor) => visitor.visitAsCheckSimple(this);
 
-  bool isRedundant(JClosedWorld closedWorld, CompilerOptions options) =>
-      _typeTest(
-        checkedInput,
-        dartType,
-        checkedType,
-        closedWorld,
-        options,
-        isCast: true,
-      ).isDefinitelyTrue;
+  /// See [HAsCheck.isRedundantOn].
+  bool isRedundantOn(HInstruction input, JClosedWorld closedWorld) => _typeTest(
+    input,
+    dartType,
+    checkedType,
+    closedWorld,
+    isCast: true,
+  ).isDefinitelyTrue;
 
   @override
   _GvnType get _gvnType => _GvnType.asCheckSimple;

pkg/compiler/lib/src/ssa/optimize.dart

@@ -2633,7 +2633,7 @@ class SsaInstructionSimplifier extends HBaseVisitor<HInstruction>
       node.checkedTypeExpression = recipe.type;
     }
 
-    if (node.isRedundant(_closedWorld, _options)) {
+    if (node.isRedundantOn(node.checkedInput, _closedWorld)) {
       return node.checkedInput;
     }
 
@@ -2659,7 +2659,7 @@ class SsaInstructionSimplifier extends HBaseVisitor<HInstruction>
 
   @override
   HInstruction visitAsCheckSimple(HAsCheckSimple node) {
-    if (node.isRedundant(_closedWorld, _options)) {
+    if (node.isRedundantOn(node.checkedInput, _closedWorld)) {
       return node.checkedInput;
     }
     return node;
@@ -2675,7 +2675,7 @@ class SsaInstructionSimplifier extends HBaseVisitor<HInstruction>
       node.dartType = recipe.type;
     }
 
-    AbstractBool result = node.evaluate(_closedWorld, _options);
+    AbstractBool result = node.evaluateOn(node.checkedInput, _closedWorld);
     if (result.isDefinitelyFalse) {
       _metrics.countIsTestDecided.add();
       return _graph.addConstantBool(false, _closedWorld);
@@ -2724,7 +2724,7 @@ class SsaInstructionSimplifier extends HBaseVisitor<HInstruction>
 
   @override
   HInstruction visitIsTestSimple(HIsTestSimple node) {
-    AbstractBool result = node.evaluate(_closedWorld, _options);
+    AbstractBool result = node.evaluateOn(node.checkedInput, _closedWorld);
     if (result.isDefinitelyFalse) {
       _metrics.countIsTestDecided.add();
       return _graph.addConstantBool(false, _closedWorld);

pkg/compiler/lib/src/ssa/type_builder.dart

@@ -70,7 +70,7 @@ abstract class TypeBuilder {
     // similar operation on `registry`; otherwise, this one might not be needed.
     builder.registry.registerTypeUse(TypeUse.isCheck(type));
     if (other is HAsCheck &&
-        other.isRedundant(builder.closedWorld, builder.options)) {
+        other.isRedundantOn(other.checkedInput, builder.closedWorld)) {
       return original;
     }
     return other;

pkg/compiler/test/helpers/shared_helper.dart

@@ -254,10 +254,8 @@ class ConstantToTextVisitor
       _unsupported(constant);
 
   @override
-  void visitDummyInterceptor(
-    DummyInterceptorConstantValue constant,
-    StringBuffer sb,
-  ) => _unsupported(constant);
+  void visitDummy(DummyConstantValue constant, StringBuffer sb) =>
+      _unsupported(constant);
 
   @override
   void visitLateSentinel(LateSentinelConstantValue constant, StringBuffer sb) =>