[dart2js] Eliminate a use of a tree node in impact data(2).

This CL moves the handling of the runtime type use hint to when we build
impact data.

Change-Id: I2807f05f604103809f8b62da55f43dd89029e7ef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/239845
Reviewed-by: Sigmund Cherem <[email protected]>
Commit-Queue: Joshua Litt <[email protected]>

Author: joshualitt

pkg/compiler/lib/src/ir/impact.dart

@@ -177,10 +177,8 @@ abstract class ImpactRegistry {
       List<String> namedArguments,
       List<ir.DartType> typeArguments);
 
-  // TODO(johnniwinther): Change [node] to `InstanceGet` when the old method
-  // invocation encoding is no longer used.
-  void registerRuntimeTypeUse(ir.Expression node, RuntimeTypeUseKind kind,
-      ir.DartType receiverType, ir.DartType argumentType);
+  void registerRuntimeTypeUse(RuntimeTypeUseKind kind, ir.DartType receiverType,
+      ir.DartType argumentType);
 
   void registerConstructorNode(ir.Constructor node);
   void registerFieldNode(ir.Field node);

pkg/compiler/lib/src/ir/impact_data.dart

@@ -14,6 +14,7 @@ import '../elements/entities.dart';
 import '../elements/types.dart';
 import '../ir/scope.dart';
 import '../kernel/element_map.dart';
+import '../options.dart';
 import '../serialization/serialization.dart';
 import '../util/enumset.dart';
 import 'constants.dart';
@@ -57,6 +58,8 @@ class ImpactBuilder extends StaticTypeVisitor implements ImpactRegistry {
   String _typeToString(DartType type) =>
       type.toStructuredText(_elementMap.types, _elementMap.options);
 
+  CompilerOptions get _options => _elementMap.options;
+
   /// Return the named arguments names as a list of strings.
   List<String> _getNamedArguments(ir.Arguments arguments) =>
       arguments.named.map((n) => n.name).toList();
@@ -551,12 +554,23 @@ class ImpactBuilder extends StaticTypeVisitor implements ImpactRegistry {
     return super.visitSwitchStatement(node);
   }
 
-  // TODO(johnniwinther): Change [node] `InstanceGet` when the old method
-  // invocation encoding is no longer used.
   @override
   void handleRuntimeTypeUse(ir.Expression node, RuntimeTypeUseKind kind,
       ir.DartType receiverType, ir.DartType argumentType) {
-    registerRuntimeTypeUse(node, kind, receiverType, argumentType);
+    if (_options.omitImplicitChecks) {
+      switch (kind) {
+        case RuntimeTypeUseKind.string:
+          if (!_options.laxRuntimeTypeToString) {
+            _reporter.reportHintMessage(computeSourceSpanFromTreeNode(node),
+                MessageKind.RUNTIME_TYPE_TO_STRING);
+          }
+          break;
+        case RuntimeTypeUseKind.equals:
+        case RuntimeTypeUseKind.unknown:
+          break;
+      }
+    }
+    registerRuntimeTypeUse(kind, receiverType, argumentType);
   }
 
   @override
@@ -952,14 +966,12 @@ class ImpactBuilder extends StaticTypeVisitor implements ImpactRegistry {
     _data._intLiterals.add(value);
   }
 
-  // TODO(johnniwinther): Change [node] `InstanceGet` when the old method
-  // invocation encoding is no longer used.
   @override
-  void registerRuntimeTypeUse(ir.Expression node, RuntimeTypeUseKind kind,
-      ir.DartType receiverType, ir.DartType argumentType) {
+  void registerRuntimeTypeUse(RuntimeTypeUseKind kind, ir.DartType receiverType,
+      ir.DartType argumentType) {
     _data._runtimeTypeUses ??= [];
     _data._runtimeTypeUses
-        .add(_RuntimeTypeUse(node, kind, receiverType, argumentType));
+        .add(_RuntimeTypeUse(kind, receiverType, argumentType));
   }
 
   @override
@@ -1520,7 +1532,7 @@ class ImpactData {
     if (_runtimeTypeUses != null) {
       for (_RuntimeTypeUse data in _runtimeTypeUses) {
         registry.registerRuntimeTypeUse(
-            data.node, data.kind, data.receiverType, data.argumentType);
+            data.kind, data.receiverType, data.argumentType);
       }
     }
     if (_forInData != null) {
@@ -2094,28 +2106,23 @@ class _ContainerLiteral {
 class _RuntimeTypeUse {
   static const String tag = '_RuntimeTypeUse';
 
-  // TODO(johnniwinther): Change [node] `InstanceGet` when the old method
-  // invocation encoding is no longer used.
-  final ir.Expression node;
   final RuntimeTypeUseKind kind;
   final ir.DartType receiverType;
   final ir.DartType argumentType;
 
-  _RuntimeTypeUse(this.node, this.kind, this.receiverType, this.argumentType);
+  _RuntimeTypeUse(this.kind, this.receiverType, this.argumentType);
 
   factory _RuntimeTypeUse.fromDataSource(DataSourceReader source) {
     source.begin(tag);
-    ir.TreeNode node = source.readTreeNode();
     RuntimeTypeUseKind kind = source.readEnum(RuntimeTypeUseKind.values);
     ir.DartType receiverType = source.readDartTypeNode();
     ir.DartType argumentType = source.readDartTypeNode(allowNull: true);
     source.end(tag);
-    return _RuntimeTypeUse(node, kind, receiverType, argumentType);
+    return _RuntimeTypeUse(kind, receiverType, argumentType);
   }
 
   void toDataSink(DataSinkWriter sink) {
     sink.begin(tag);
-    sink.writeTreeNode(node);
     sink.writeEnum(kind);
     sink.writeDartTypeNode(receiverType);
     sink.writeDartTypeNode(argumentType, allowNull: true);

pkg/compiler/lib/src/kernel/kernel_impact.dart

@@ -633,29 +633,13 @@ class KernelImpactConverter implements ImpactRegistry {
         const <DartType>[]));
   }
 
-  // TODO(johnniwinther): Change [node] `InstanceGet` when the old method
-  // invocation encoding is no longer used.
   @override
-  void registerRuntimeTypeUse(ir.Expression node, RuntimeTypeUseKind kind,
-      ir.DartType receiverType, ir.DartType argumentType) {
+  void registerRuntimeTypeUse(RuntimeTypeUseKind kind, ir.DartType receiverType,
+      ir.DartType argumentType) {
     DartType receiverDartType = elementMap.getDartType(receiverType);
     DartType argumentDartType =
         argumentType == null ? null : elementMap.getDartType(argumentType);
 
-    if (_options.omitImplicitChecks) {
-      switch (kind) {
-        case RuntimeTypeUseKind.string:
-          if (!_options.laxRuntimeTypeToString) {
-            reporter.reportHintMessage(computeSourceSpanFromTreeNode(node),
-                MessageKind.RUNTIME_TYPE_TO_STRING);
-          }
-          break;
-        case RuntimeTypeUseKind.equals:
-        case RuntimeTypeUseKind.unknown:
-          break;
-      }
-    }
-
     // Enable runtime type support if we discover a getter called
     // runtimeType. We have to enable runtime type before hitting the
     // codegen, so that constructors know whether they need to generate code

pkg/compiler/test/impact/impact_test.dart

@@ -94,8 +94,8 @@ class ImpactDataGoldener implements ImpactRegistry {
   ImpactDataGoldener(this.elementMap, this.features);
 
   @override
-  void registerRuntimeTypeUse(ir.Expression node, RuntimeTypeUseKind kind,
-      ir.DartType receiverType, ir.DartType argumentType) {
+  void registerRuntimeTypeUse(RuntimeTypeUseKind kind, ir.DartType receiverType,
+      ir.DartType argumentType) {
     final runtimeTypeUse = RuntimeTypeUse(
         kind,
         elementMap.getDartType(receiverType),