[dart2js] Prepare to migrate ir/impact_data.dart

Add the required methods to serialization_interfaces.dart

Change-Id: I201461f7a534d02cbfef4d095c670e0c60c40f22
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/249664
Reviewed-by: Nate Biggs <[email protected]>
Commit-Queue: Stephen Adams <[email protected]>

Author: rakudrama

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

@@ -7,7 +7,7 @@
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/type_environment.dart' as ir;
 
-import '../serialization/serialization.dart';
+import '../serialization/serialization_interfaces.dart';
 import 'class_relation.dart';
 import 'constants.dart';
 import 'impact_data.dart';

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

@@ -13,9 +13,9 @@ import '../common/elements.dart';
 import '../elements/entities.dart';
 import '../elements/types.dart';
 import '../ir/scope.dart';
-import '../kernel/element_map.dart';
+import '../kernel/element_map.dart' show KernelToElementMap;
 import '../options.dart';
-import '../serialization/serialization.dart';
+import '../serialization/serialization_interfaces.dart';
 import '../util/enumset.dart';
 import 'class_relation.dart';
 import 'constants.dart';
@@ -1103,12 +1103,12 @@ class ImpactData {
     _typeUses = source.readListOrNull(() => _TypeUse.fromDataSource(source));
     _redirectingInitializers = source
         .readListOrNull(() => _RedirectingInitializer.fromDataSource(source));
-    _fieldInitializers = source.readMemberNodes<ir.Field>(emptyAsNull: true);
+    _fieldInitializers = source.readMemberNodesOrNull<ir.Field>();
     _fieldConstantInitializers =
-        source.readMemberNodeMap(source.readTreeNodes, emptyAsNull: true);
+        source.readMemberNodeMapOrNull(source.readTreeNodes);
     _typeLiterals =
         source.readListOrNull(() => _TypeLiteral.fromDataSource(source));
-    _localFunctions = source.readTreeNodes(emptyAsNull: true);
+    _localFunctions = source.readTreeNodesOrNull();
     _genericInstantiations = source
         .readListOrNull(() => _GenericInstantiation.fromDataSource(source));
     _staticSets =
@@ -1135,14 +1135,11 @@ class ImpactData {
     _forInData = source.readListOrNull(() => _ForInData.fromDataSource(source));
 
     // TODO(johnniwinther): Remove these when CFE provides constants.
-    _constructorNodes =
-        source.readMemberNodes<ir.Constructor>(emptyAsNull: true);
-    _fieldNodes = source.readMemberNodes<ir.Field>(emptyAsNull: true);
-    _procedureNodes = source.readMemberNodes<ir.Procedure>(emptyAsNull: true);
-    _switchStatementNodes =
-        source.readTreeNodes<ir.SwitchStatement>(emptyAsNull: true);
-    _staticInvocationNodes =
-        source.readTreeNodes<ir.StaticInvocation>(emptyAsNull: true);
+    _constructorNodes = source.readMemberNodesOrNull<ir.Constructor>();
+    _fieldNodes = source.readMemberNodesOrNull<ir.Field>();
+    _procedureNodes = source.readMemberNodesOrNull<ir.Procedure>();
+    _switchStatementNodes = source.readTreeNodesOrNull<ir.SwitchStatement>();
+    _staticInvocationNodes = source.readTreeNodesOrNull<ir.StaticInvocation>();
     _hasConstSymbolConstructorInvocation = source.readBool();
     source.end(tag);
   }

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

@@ -15,7 +15,7 @@ import '../elements/indexed.dart';
 import '../elements/jumps.dart';
 import '../elements/types.dart';
 import '../serialization/deferrable.dart';
-import '../serialization/serialization.dart';
+import '../serialization/serialization_interfaces.dart';
 
 import 'element_map.dart';
 import 'elements.dart' show JGeneratorBody;

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

@@ -2,7 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:kernel/ast.dart' as ir show DartType, Member, TreeNode;
+import 'package:kernel/ast.dart' as ir
+    show DartType, LibraryDependency, Member, Name, TreeNode;
 
 import '../constants/values.dart' show ConstantValue;
 import '../elements/entities.dart';
@@ -49,6 +50,19 @@ abstract class DataSinkWriter {
   void writeEnum(dynamic value);
   void writeUri(Uri value);
 
+  void writeMemberNode(ir.Member nvalue);
+  void writeMemberNodes(Iterable<ir.Member>? values, {bool allowNull = false});
+  void writeMemberNodeMap<V>(Map<ir.Member, V>? map, void f(V value),
+      {bool allowNull = false});
+
+  void writeName(ir.Name value);
+  void writeLibraryDependencyNode(ir.LibraryDependency value);
+  void writeLibraryDependencyNodeOrNull(ir.LibraryDependency? value);
+
+  void writeTreeNode(ir.TreeNode value);
+  void writeTreeNodeOrNull(ir.TreeNode value);
+  void writeTreeNodes(Iterable<ir.TreeNode>? values, {bool allowNull = false});
+
   // TODO(48820): 'covariant ClassEntity' is used below because the
   // implementation takes IndexedClass. What this means is that in pre-NNBD
   // code, the call site to the implementation DataSinkWriter has an implicit
@@ -85,6 +99,8 @@ abstract class DataSinkWriter {
 
   void writeDartTypeNode(ir.DartType value);
   void writeDartTypeNodeOrNull(ir.DartType? value);
+  void writeDartTypeNodes(Iterable<ir.DartType>? values,
+      {bool allowNull = false});
 
   void writeDartType(DartType value);
   void writeDartTypeOrNull(DartType? value);
@@ -107,6 +123,9 @@ abstract class DataSinkWriter {
 
   void writeValueOrNull<E>(E? value, void f(E value));
 
+  void writeDoubleValue(double value);
+  void writeIntegerValue(int value);
+
   void writeImport(ImportEntity import);
   void writeImportOrNull(ImportEntity? import);
   void writeImports(Iterable<ImportEntity>? values, {bool allowNull = false});
@@ -137,6 +156,21 @@ abstract class DataSourceReader {
   E readEnum<E>(List<E> values);
   Uri readUri();
 
+  ir.Member readMemberNode();
+  List<E> readMemberNodes<E extends ir.Member>();
+  List<E>? readMemberNodesOrNull<E extends ir.Member>();
+  Map<K, V> readMemberNodeMap<K extends ir.Member, V>(V f());
+  Map<K, V>? readMemberNodeMapOrNull<K extends ir.Member, V>(V f());
+
+  ir.Name readName();
+  ir.LibraryDependency readLibraryDependencyNode();
+  ir.LibraryDependency readLibraryDependencyNodeOrNull();
+
+  ir.TreeNode readTreeNode();
+  ir.TreeNode? readTreeNodeOrNull();
+  List<E> readTreeNodes<E extends ir.TreeNode>();
+  List<E>? readTreeNodesOrNull<E extends ir.TreeNode>();
+
   ClassEntity readClass(); // IndexedClass
   ClassEntity? readClassOrNull(); // IndexedClass
   List<E> readClasses<E extends ClassEntity>();
@@ -161,6 +195,8 @@ abstract class DataSourceReader {
 
   ir.DartType readDartTypeNode();
   ir.DartType? readDartTypeNodeOrNull();
+  List<ir.DartType> readDartTypeNodes();
+  List<ir.DartType>? readDartTypeNodesOrNull();
 
   DartType readDartType();
   DartType? readDartTypeOrNull();
@@ -184,6 +220,9 @@ abstract class DataSourceReader {
 
   E? readValueOrNull<E>(E f());
 
+  double readDoubleValue();
+  int readIntegerValue();
+
   ImportEntity readImport();
   ImportEntity? readImportOrNull();
   List<ImportEntity> readImports();

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

@@ -340,6 +340,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   }
 
   /// Writes a reference to the kernel member node [value] to this data sink.
+  @override
   void writeMemberNode(ir.Member value) {
     _writeDataKind(DataKind.memberNode);
     _writeMemberNode(value);
@@ -367,6 +368,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   ///
   /// This is a convenience method to be used together with
   /// [DataSourceReader.readMemberNodes].
+  @override
   void writeMemberNodes(Iterable<ir.Member> values, {bool allowNull = false}) {
     if (values == null) {
       assert(allowNull);
@@ -385,6 +387,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   ///
   /// This is a convenience method to be used together with
   /// [DataSourceReader.readMemberNodeMap].
+  @override
   void writeMemberNodeMap<V>(Map<ir.Member, V> map, void f(V value),
       {bool allowNull = false}) {
     if (map == null) {
@@ -400,12 +403,14 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   }
 
   /// Writes a kernel name node to this data sink.
+  @override
   void writeName(ir.Name value) {
     writeString(value.text);
     writeValueOrNull(value.library, writeLibraryNode);
   }
 
   /// Writes a kernel library dependency node [value] to this data sink.
+  @override
   void writeLibraryDependencyNode(ir.LibraryDependency value) {
     ir.Library library = value.parent;
     writeLibraryNode(library);
@@ -414,11 +419,13 @@ class DataSinkWriter implements migrated.DataSinkWriter {
 
   /// Writes a potentially `null` kernel library dependency node [value] to
   /// this data sink.
+  @override
   void writeLibraryDependencyNodeOrNull(ir.LibraryDependency value) {
     writeValueOrNull(value, writeLibraryDependencyNode);
   }
 
   /// Writes a reference to the kernel tree node [value] to this data sink.
+  @override
   void writeTreeNode(ir.TreeNode value) {
     _writeDataKind(DataKind.treeNode);
     _writeTreeNode(value, null);
@@ -465,6 +472,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   ///
   /// This is a convenience method to be used together with
   /// [DataSourceReader.readTreeNodeOrNull].
+  @override
   void writeTreeNodeOrNull(ir.TreeNode value) {
     writeBool(value != null);
     if (value != null) {
@@ -477,6 +485,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   ///
   /// This is a convenience method to be used together with
   /// [DataSourceReader.readTreeNodes].
+  @override
   void writeTreeNodes(Iterable<ir.TreeNode> values, {bool allowNull = false}) {
     if (values == null) {
       assert(allowNull);
@@ -692,6 +701,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   ///
   /// This is a convenience method to be used together with
   /// [DataSourceReader.readDartTypeNodes].
+  @override
   void writeDartTypeNodes(Iterable<ir.DartType> values,
       {bool allowNull = false}) {
     if (values == null) {
@@ -1112,6 +1122,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   }
 
   /// Writes a double value to this data sink.
+  @override
   void writeDoubleValue(double value) {
     _writeDataKind(DataKind.double);
     _writeDoubleValue(value);
@@ -1130,6 +1141,7 @@ class DataSinkWriter implements migrated.DataSinkWriter {
   ///
   /// This is should only when the value is not known to be a non-negative
   /// 30 bit integer. Otherwise [writeInt] should be used.
+  @override
   void writeIntegerValue(int value) {
     _writeDataKind(DataKind.int);
     _writeBigInt(BigInt.from(value));