[Attributor] Fix bug in operator of PotentialValuesState

[okura]

Summary

There are bugs in operator &= and operator ^= in PotentialValuesState.
When we clamp states, helper BooleanStates should be but were not clamped.

[lebedev.ri]

Test?

[okura]

In D85639#2206325, @lebedev.ri wrote:

Test?

In the current situation of AAPotentialValues, I think it is difficult to reflect this change in tests. I noticed this bug when I worked on D85632 and saw affected tests because AAPotentialValues has interface only.
Should I include the changes here in that patch? (But I feel that the patch is big and want to split it if possible.)

[sstefan1]

IMHO, these few lines don't make much of a difference wrt the size of the patch. Maybe just merge them?

[okura]

OK, I'll merge this with D85632.

llvm/include/llvm/Transforms/IPO/Attributor.h

struct PotentialValuesState : AbstractState {
   /// Union assumed set with the passed value.
   void unionAssumed(const MemberTy &C) { insert(C); }
 
   /// Union assumed set with assumed set of the passed state \p PVS.
   void unionAssumed(const PotentialValuesState &PVS) { unionWith(PVS); }
 
   /// "Clamp" this state with \p PVS.
   PotentialValuesState operator^=(const PotentialValuesState &PVS) {
+    IsValidState ^= PVS.IsValidState;
     unionAssumed(PVS);
     return *this;
   }
 
   PotentialValuesState operator&=(const PotentialValuesState &PVS) {
+    IsValidState &= PVS.IsValidState;
     unionAssumed(PVS);
     return *this;
   }
 
+  /// A helper state which indicate whether this state is valid or not.
+  BooleanState IsValidState;
+
 private:
   /// Check the size of this set, and invalidate when the size is no
   /// less than \p MaxPotentialValues threshold.
   void checkAndInvalidate() {
     if (Set.size() >= MaxPotentialValues)
       indicatePessimisticFixpoint();
   }
 
void intersectWith(const PotentialValuesState &R) {
     SetTy IntersectSet;
     for (const MemberTy &C : Set) {
       if (R.Set.count(C))
         IntersectSet.insert(C);
     }
     Set = IntersectSet;
   }
 
-  /// A helper state which indicate whether this state is valid or not.
-  BooleanState IsValidState;
-
   /// Container for potential values
   SetTy Set;
 };
 
 using PotentialConstantIntValuesState = PotentialValuesState<APInt>;
 
 raw_ostream &operator<<(raw_ostream &OS,
                         const PotentialConstantIntValuesState &R);