Extract ::set

and fix clear

Author: vitalybuka

clang/include/clang/Basic/Sanitizers.h

@@ -158,9 +158,9 @@ class SanitizerMaskCutoffs {
   std::array<float, SanitizerKind::SO_Count> cutoffs = {0};
 
 public:
-  float &operator[](int index) { return cutoffs[index]; }
   const float &operator[](int index) const { return cutoffs[index]; }
 
+  void set(SanitizerMask K, float V);
   void clear(SanitizerMask K = SanitizerKind::All);
 };
 

clang/lib/Basic/Sanitizers.cpp

@@ -19,12 +19,14 @@
 
 using namespace clang;
 
-void SanitizerMaskCutoffs::clear(SanitizerMask K) {
+void SanitizerMaskCutoffs::set(SanitizerMask K, float V) {
   for (unsigned int i = 0; i < SanitizerKind::SO_Count; i++)
-    if (!(K & SanitizerMask::bitPosToMask(i)))
-      cutoffs[i] = 0;
+    if (K & SanitizerMask::bitPosToMask(i))
+      cutoffs[i] = V;
 }
 
+void SanitizerMaskCutoffs::clear(SanitizerMask K) { set(K, 0); }
+
 // Once LLVM switches to C++17, the constexpr variables can be inline and we
 // won't need this.
 #define SANITIZER(NAME, ID) constexpr SanitizerMask SanitizerKind::ID;
@@ -62,10 +64,7 @@ bool clang::parseSanitizerWeightedValue(StringRef Value, bool AllowGroups,
   float C = std::clamp(A, 0.0, 1.0);
   // AllowGroups is already taken into account for ParsedKind,
   // hence we unconditionally expandSanitizerGroups.
-  SanitizerMask ExpandedKind = expandSanitizerGroups(ParsedKind);
-  for (unsigned int i = 0; i < SanitizerKind::SO_Count; i++)
-    if (ExpandedKind & SanitizerMask::bitPosToMask(i))
-      Cutoffs[i] = C;
+  Cutoffs.set(expandSanitizerGroups(ParsedKind), C);
   return true;
 }
 

clang/lib/Driver/SanitizerArgs.cpp

@@ -1153,7 +1153,7 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
   MergeHandlers.Mask |= MergeKinds;
 
   // Zero out TopHotCutoffs for unused sanitizers
-  TopHotCutoffs.clear(Sanitizers.Mask);
+  TopHotCutoffs.clear(~Sanitizers.Mask);
 }
 
 static std::string toString(const clang::SanitizerSet &Sanitizers) {