Elements. Fix for write/read of EnumSet when compiled to JavaScript.

Change-Id: I1ab2d69649f610bbc91389ac9623a89019c9d6b2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444760
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 8.1.1-dev
+* Fix for `EnumSet` usage when compiled to JavaScript.
+
 ## 8.1.0
 * Add `DartObject.constructorInvocation` with the constructor and arguments.
 * Make `PropertyAccessorElement.variable` non-nullable.

pkg/analyzer/lib/src/dart/element/element.dart

@@ -1974,7 +1974,7 @@ abstract class ElementImpl implements Element {
   }
 
   void readModifiers(SummaryDataReader reader) {
-    _modifiers = EnumSet(reader.readInt64());
+    _modifiers = EnumSet.read(reader);
   }
 
   /// Update [modifier] of this element to [value].
@@ -3675,7 +3675,7 @@ abstract class FragmentImpl implements Fragment {
   bool hasModifier(Modifier modifier) => _modifiers[modifier];
 
   void readModifiers(SummaryDataReader reader) {
-    _modifiers = EnumSet(reader.readInt64());
+    _modifiers = EnumSet.read(reader);
   }
 
   /// Set the code range for this element.

pkg/analyzer/lib/src/generated/utilities_collection_js.dart

@@ -5,10 +5,17 @@
 /// Provides [EnumSet] which works when compiled to JS.
 library;
 
+import 'package:analyzer/src/summary2/data_reader.dart';
+import 'package:analyzer/src/summary2/data_writer.dart';
+
 /// The set of [Enum] values, up to `60` constants.
 extension type EnumSet<T extends Enum>((int, int) _bits) {
   EnumSet.empty() : this((0, 0));
 
+  factory EnumSet.read(SummaryDataReader reader) {
+    return EnumSet((reader.readInt64(), reader.readInt64()));
+  }
+
   /// Whether [constant] is present.
   bool operator [](T constant) {
     var index = constant.index;
@@ -42,6 +49,11 @@ extension type EnumSet<T extends Enum>((int, int) _bits) {
     }
   }
 
+  void write(BufferedSink writer) {
+    writer.writeInt64(_bits.$1);
+    writer.writeInt64(_bits.$2);
+  }
+
   /// Throws an exception if the [index] does not fit the storage.
   static void _checkIndex(int index) {
     if (index < 0 || index > 60) {

pkg/analyzer/lib/src/generated/utilities_collection_native.dart

@@ -6,12 +6,17 @@
 /// available.
 library;
 
+import 'package:analyzer/src/summary2/data_reader.dart';
 import 'package:analyzer/src/summary2/data_writer.dart';
 
 /// The set of [Enum] values, backed by [int].
 extension type EnumSet<T extends Enum>(int _bits) {
   EnumSet.empty() : this(0);
 
+  factory EnumSet.read(SummaryDataReader reader) {
+    return EnumSet(reader.readInt64());
+  }
+
   /// Whether [constant] is present.
   bool operator [](T constant) {
     var index = constant.index;

pkg/analyzer/pubspec.yaml

@@ -1,5 +1,5 @@
 name: analyzer
-version: 8.1.0
+version: 8.1.1-dev
 description: >-
   This package provides a library that performs static analysis of Dart code.
 repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer