[dart2js] Change Enumset.operator +/- to Enumset.add/remove.

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

Author: fishythefish

pkg/compiler/lib/src/common/codegen.dart

@@ -218,7 +218,7 @@ class _CodegenImpact extends WorldImpactBuilderImpl implements CodegenImpact {
   bool get usesInterceptor => _usesInterceptor;
 
   void registerAsyncMarker(AsyncMarker asyncMarker) {
-    _asyncMarkers += asyncMarker;
+    _asyncMarkers = _asyncMarkers.add(asyncMarker);
   }
 
   @override

pkg/compiler/lib/src/inferrer/type_graph_nodes.dart

@@ -228,7 +228,7 @@ abstract class TypeInformation {
   }
 
   void giveUp(InferrerEngine inferrer, {bool clearInputs = true}) {
-    _flags += _Flag.abandonInferencing;
+    _flags = _flags.add(_Flag.abandonInferencing);
     // Do not remove [this] as a user of nodes in [inputs],
     // because our tracing analysis could be interested in tracing
     // this node.
@@ -275,14 +275,14 @@ abstract class TypeInformation {
     // Do not remove users because the tracing analysis could be interested
     // in tracing the users of this node.
     _inputs = STOP_TRACKING_INPUTS_MARKER;
-    _flags += _Flag.abandonInferencing;
-    _flags += _Flag.isStable;
+    _flags = _flags.add(_Flag.abandonInferencing);
+    _flags = _flags.add(_Flag.isStable);
   }
 
   void maybeResume() {
     if (!mightResume) return;
-    _flags -= _Flag.abandonInferencing;
-    _flags -= _Flag.doNotEnqueue;
+    _flags = _flags.remove(_Flag.abandonInferencing);
+    _flags = _flags.remove(_Flag.doNotEnqueue);
   }
 
   /// Destroys information not needed after type inference.
@@ -501,10 +501,10 @@ abstract class MemberTypeInformation extends ElementTypeInformation
   void markCalled() {
     if (_flags.contains(_Flag.isCalled)) {
       if (!_flags.contains(_Flag.isCalledMoreThanOnce)) {
-        _flags += _Flag.isCalledMoreThanOnce;
+        _flags = _flags.add(_Flag.isCalledMoreThanOnce);
       }
     } else {
-      _flags += _Flag.isCalled;
+      _flags = _flags.add(_Flag.isCalled);
     }
   }
 
@@ -809,7 +809,7 @@ class ParameterTypeInformation extends ElementTypeInformation {
             .abstractValue,
         _inputType = abstractValueDomain.uncomputedType,
         super._internal() {
-    _flags += _Flag.isClosureParameter;
+    _flags = _flags.add(_Flag.isClosureParameter);
   }
 
   ParameterTypeInformation.static(
@@ -834,7 +834,7 @@ class ParameterTypeInformation extends ElementTypeInformation {
             _createInstanceMemberStaticType(abstractValueDomain, type, _method),
         _inputType = abstractValueDomain.uncomputedType,
         super._withInputs() {
-    _flags += _Flag.isInstanceMemberParameter;
+    _flags = _flags.add(_Flag.isInstanceMemberParameter);
     _flags = _flags.update(_Flag.isVirtual, isVirtual);
   }
 
@@ -1223,12 +1223,12 @@ class DynamicCallSiteTypeInformation<T extends ir.Node>
   }
 
   void invalidateTargetsIncludeComplexNoSuchMethod() {
-    _flags -= _Flag.hasTargetsIncludeComplexNoSuchMethod;
+    _flags = _flags.remove(_Flag.hasTargetsIncludeComplexNoSuchMethod);
   }
 
   bool targetsIncludeComplexNoSuchMethod(InferrerEngine inferrer) {
     if (!_hasTargetsIncludeComplexNoSuchMethod) {
-      _flags += _Flag.hasTargetsIncludeComplexNoSuchMethod;
+      _flags = _flags.add(_Flag.hasTargetsIncludeComplexNoSuchMethod);
       final value = targets.any((target) => inferrer.memberHierarchyBuilder
               .anyTargetMember(target, (MemberEntity e) {
             return e.isFunction &&
@@ -1572,7 +1572,7 @@ class ClosureCallSiteTypeInformation extends CallSiteTypeInformation {
 /// type.
 class ConcreteTypeInformation extends TypeInformation {
   ConcreteTypeInformation(super.type) : super.untracked() {
-    _flags += _Flag.isStable;
+    _flags = _flags.add(_Flag.isStable);
   }
 
   @override

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

@@ -762,7 +762,7 @@ class ImpactBuilder extends ir.RecursiveVisitor implements ImpactRegistry {
   }
 
   void _registerFeature(_Feature feature) {
-    _data._features += feature;
+    _data._features = _data._features.add(feature);
   }
 
   void _registerTypeUse(ir.DartType type, _TypeUseKind kind) {

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

@@ -153,7 +153,7 @@ EnumSet<PragmaAnnotation> processMemberAnnotations(
     String suffix = data.suffix;
     final annotation = PragmaAnnotation.lookupMap[suffix];
     if (annotation != null) {
-      annotations += annotation;
+      annotations = annotations.add(annotation);
 
       if (data.options != null && !annotation.hasOption) {
         reporter.reportErrorMessage(
@@ -210,7 +210,7 @@ EnumSet<PragmaAnnotation> processMemberAnnotations(
                 "with @pragma('dart2js:${other.name}')."
           });
           reportedExclusions.update(
-              annotation, (exclusions) => exclusions + other,
+              annotation, (exclusions) => exclusions.add(other),
               ifAbsent: () => EnumSet.fromValue(other));
         }
       }

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

@@ -145,16 +145,16 @@ class ClassHierarchyNode {
       {required bool add}) {
     ClassHierarchyNode? parent = parentNode;
     if (add) {
-      _mask -= Instantiation.UNINSTANTIATED;
-      _mask += instantiation;
+      _mask = _mask.remove(Instantiation.UNINSTANTIATED);
+      _mask = _mask.add(instantiation);
       while (parent != null) {
         parent._updateInstantiatedSubclassCount(1);
         parent = parent.parentNode;
       }
     } else {
-      _mask -= instantiation;
+      _mask = _mask.remove(instantiation);
       if (_mask.isEmpty) {
-        _mask += Instantiation.UNINSTANTIATED;
+        _mask = _mask.add(Instantiation.UNINSTANTIATED);
       }
       while (parent != null) {
         parent._updateInstantiatedSubclassCount(-1);
@@ -183,12 +183,12 @@ class ClassHierarchyNode {
     bool after = isIndirectlyInstantiated;
     if (before != after) {
       if (after) {
-        _mask -= Instantiation.UNINSTANTIATED;
-        _mask += Instantiation.INDIRECTLY_INSTANTIATED;
+        _mask = _mask.remove(Instantiation.UNINSTANTIATED);
+        _mask = _mask.add(Instantiation.INDIRECTLY_INSTANTIATED);
       } else {
-        _mask -= Instantiation.INDIRECTLY_INSTANTIATED;
+        _mask = _mask.remove(Instantiation.INDIRECTLY_INSTANTIATED);
         if (_mask.isEmpty) {
-          _mask += Instantiation.UNINSTANTIATED;
+          _mask = _mask.add(Instantiation.UNINSTANTIATED);
         }
       }
     }

pkg/compiler/lib/src/util/enumset.dart

@@ -39,17 +39,16 @@ extension type const EnumSet<E extends Enum>(Bitset mask) {
 
   /// Returns a set containing all enum values in [this] as well as [enumValue].
   @useResult
-  EnumSet<E> operator +(E enumValue) => EnumSet(mask.union(enumValue.mask(0)));
+  EnumSet<E> add(E enumValue) => EnumSet(mask.union(enumValue.mask(0)));
 
   /// Returns a set containing all enum values in [this] except for [enumValue].
   @useResult
-  EnumSet<E> operator -(E enumValue) =>
-      EnumSet(mask.setMinus(enumValue.mask(0)));
+  EnumSet<E> remove(E enumValue) => EnumSet(mask.setMinus(enumValue.mask(0)));
 
   /// Returns a set with the bit for [value] enabled or disabled depending on
   /// [state].
   @useResult
-  EnumSet<E> update(E value, bool state) => state ? this + value : this - value;
+  EnumSet<E> update(E value, bool state) => state ? add(value) : remove(value);
 
   /// Returns a new set containing all values in both this and the [other] set.
   @useResult

pkg/compiler/test/model/enumset_test.dart

@@ -47,36 +47,36 @@ void testAddRemoveContains() {
 
   check(0, []);
 
-  enumSet += Enum.B;
+  enumSet = enumSet.add(Enum.B);
   check(2, [Enum.B]);
 
-  enumSet += Enum.F;
+  enumSet = enumSet.add(Enum.F);
   check(34, [Enum.F, Enum.B]);
 
-  enumSet += Enum.A;
+  enumSet = enumSet.add(Enum.A);
   check(35, [Enum.F, Enum.B, Enum.A]);
 
-  enumSet += Enum.A;
+  enumSet = enumSet.add(Enum.A);
   check(35, [Enum.F, Enum.B, Enum.A]);
 
-  enumSet -= Enum.C;
+  enumSet = enumSet.remove(Enum.C);
   check(35, [Enum.F, Enum.B, Enum.A]);
 
-  enumSet -= Enum.B;
+  enumSet = enumSet.remove(Enum.B);
   check(33, [Enum.F, Enum.A]);
 
-  enumSet -= Enum.A;
+  enumSet = enumSet.remove(Enum.A);
   check(32, [Enum.F]);
 
   enumSet = EnumSet.empty();
   check(0, []);
 
-  enumSet += Enum.A;
-  enumSet += Enum.B;
-  enumSet += Enum.C;
-  enumSet += Enum.D;
-  enumSet += Enum.E;
-  enumSet += Enum.F;
+  enumSet = enumSet.add(Enum.A);
+  enumSet = enumSet.add(Enum.B);
+  enumSet = enumSet.add(Enum.C);
+  enumSet = enumSet.add(Enum.D);
+  enumSet = enumSet.add(Enum.E);
+  enumSet = enumSet.add(Enum.F);
   check(63, [Enum.F, Enum.E, Enum.D, Enum.C, Enum.B, Enum.A]);
 }
 
@@ -107,8 +107,8 @@ void testConstructorsIntersects() {
   check(emptyA, emptyD);
   check(emptyA, emptyE);
 
-  EnumSet<Enum> singleA = const EnumSet<Enum>.empty() + Enum.C;
-  EnumSet<Enum> singleB = EnumSet<Enum>.empty() + Enum.C;
+  EnumSet<Enum> singleA = const EnumSet<Enum>.empty().add(Enum.C);
+  EnumSet<Enum> singleB = EnumSet<Enum>.empty().add(Enum.C);
   EnumSet<Enum> singleC = const EnumSet<Enum>.fromRawBits(4);
   EnumSet<Enum> singleD = EnumSet<Enum>.fromRawBits(4);
   EnumSet<Enum> singleE = EnumSet<Enum>.fromValues([Enum.C]);
@@ -121,8 +121,10 @@ void testConstructorsIntersects() {
   check(singleA, singleE);
   check(singleA, singleF);
 
-  EnumSet<Enum> multiA = const EnumSet<Enum>.empty() + Enum.A + Enum.D + Enum.F;
-  EnumSet<Enum> multiB = EnumSet<Enum>.empty() + Enum.A + Enum.D + Enum.F;
+  EnumSet<Enum> multiA =
+      const EnumSet<Enum>.empty().add(Enum.A).add(Enum.D).add(Enum.F);
+  EnumSet<Enum> multiB =
+      EnumSet<Enum>.empty().add(Enum.A).add(Enum.D).add(Enum.F);
   EnumSet<Enum> multiC = const EnumSet<Enum>.fromRawBits(41);
   EnumSet<Enum> multiD = EnumSet<Enum>.fromRawBits(41);
   EnumSet<Enum> multiE = EnumSet<Enum>.fromValues([Enum.F, Enum.A, Enum.D]);