commit 1031795c6120a601aa2c58dd82df18429639a433
author Mayank Patke <fishythefish@google.com> Fri Sep 06 16:20:37 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 06 16:20:37 2024 +0000
tree e7e440fbfda439e3ef6ac7790f1a2a2296c99267
parent 15366a10b7852958b725563218f5a3e793b72014

[dart2js] Convert static use flags to enum.

Change-Id: I137c9cbd865fb9944d4d326f5d73f9f09a6e2505
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/383900
Reviewed-by: Nate Biggs <natebiggs@google.com>
Commit-Queue: Mayank Patke <fishythefish@google.com>

pkg/compiler/lib/src/universe/use.dart

diff --git a/pkg/compiler/lib/src/universe/use.dart b/pkg/compiler/lib/src/universe/use.dart
index 129a01d..2b538f0 100644
--- a/pkg/compiler/lib/src/universe/use.dart
+++ b/pkg/compiler/lib/src/universe/use.dart
@@ -25,6 +25,7 @@
 import '../inferrer/abstract_value_domain.dart';
 import '../serialization/serialization.dart';
 import '../js_model/closure.dart' show JContextField;
+import '../util/enumset.dart';
 import '../util/util.dart' show equalElements, Hashing;
 import 'call_structure.dart' show CallStructure;
 import 'selector.dart' show Selector;
@@ -170,18 +171,20 @@
   WEAK_STATIC_TEAR_OFF,
 }
 
+enum _StaticUseFlag {
+  type,
+  callStructure,
+  deferredImport,
+  constant,
+  typeArguments,
+}
+
 /// Statically known use of an [Entity].
 // TODO(johnniwinther): Create backend-specific implementations with better
 // invariants.
 class StaticUse {
   static const String tag = 'static-use';
 
-  static const _typeFlag = 1;
-  static const _callStructureFlag = 2;
-  static const _deferredImportFlag = 4;
-  static const _constantFlag = 8;
-  static const _typeArgumentsFlag = 16;
-
   final Entity element;
   final StaticUseKind kind;
   @override
@@ -223,26 +226,26 @@
     source.begin(tag);
     MemberEntity element = source.readMember();
     StaticUseKind kind = source.readEnum(StaticUseKind.values);
-    final bitMask = source.readInt();
+    final bitMask = EnumSet<_StaticUseFlag>(source.readInt());
     InterfaceType? type;
     CallStructure? callStructure;
     ImportEntity? deferredImport;
     ConstantValue? constant;
     List<DartType>? typeArguments;
 
-    if (bitMask & _typeFlag != 0) {
+    if (bitMask.contains(_StaticUseFlag.type)) {
       type = source.readDartType() as InterfaceType;
     }
-    if (bitMask & _callStructureFlag != 0) {
+    if (bitMask.contains(_StaticUseFlag.callStructure)) {
       callStructure = CallStructure.readFromDataSource(source);
     }
-    if (bitMask & _deferredImportFlag != 0) {
+    if (bitMask.contains(_StaticUseFlag.deferredImport)) {
       deferredImport = source.readImport();
     }
-    if (bitMask & _constantFlag != 0) {
+    if (bitMask.contains(_StaticUseFlag.constant)) {
       constant = source.readConstant();
     }
-    if (bitMask & _typeArgumentsFlag != 0) {
+    if (bitMask.contains(_StaticUseFlag.typeArguments)) {
       typeArguments = source.readDartTypes();
     }
     source.end(tag);
@@ -258,23 +261,14 @@
     sink.begin(tag);
     sink.writeMember(element as MemberEntity);
     sink.writeEnum(kind);
-    int bitMask = 0;
-    if (type != null) {
-      bitMask |= _typeFlag;
-    }
-    if (callStructure != null) {
-      bitMask |= _callStructureFlag;
-    }
-    if (deferredImport != null) {
-      bitMask |= _deferredImportFlag;
-    }
-    if (constant != null) {
-      bitMask |= _constantFlag;
-    }
-    if (typeArguments != null) {
-      bitMask |= _typeArgumentsFlag;
-    }
-    sink.writeInt(bitMask);
+    final bitMask = EnumSet<_StaticUseFlag>.fromValues([
+      if (type != null) _StaticUseFlag.type,
+      if (callStructure != null) _StaticUseFlag.callStructure,
+      if (deferredImport != null) _StaticUseFlag.deferredImport,
+      if (constant != null) _StaticUseFlag.constant,
+      if (typeArguments != null) _StaticUseFlag.typeArguments,
+    ]);
+    sink.writeInt(bitMask.mask);
     if (type != null) {
       sink.writeDartType(type!);
     }