This reverts part of commit b82e48d.

And fix V type in ::set.

Author: vitalybuka

clang/include/clang/Basic/Sanitizers.h

@@ -160,7 +160,7 @@ class SanitizerMaskCutoffs {
 public:
   std::optional<double> operator[](unsigned Kind) const;
 
-  void set(SanitizerMask K, float V);
+  void set(SanitizerMask K, double V);
   void clear(SanitizerMask K = SanitizerKind::All);
 };
 

clang/lib/Basic/Sanitizers.cpp

@@ -24,7 +24,7 @@ using namespace clang;
 
 static const double SanitizerMaskCutoffsEps = 0.000000001f;
 
-void SanitizerMaskCutoffs::set(SanitizerMask K, float V) {
+void SanitizerMaskCutoffs::set(SanitizerMask K, double V) {
   if (V < SanitizerMaskCutoffsEps && Cutoffs.empty())
     return;
   for (unsigned int i = 0; i < SanitizerKind::SO_Count; i++)
@@ -38,7 +38,7 @@ std::optional<double> SanitizerMaskCutoffs::operator[](unsigned Kind) const {
   if (Cutoffs.empty() || Cutoffs[Kind] < SanitizerMaskCutoffsEps)
     return std::nullopt;
 
-  return Cutoffs[Kind];
+return Cutoffs[Kind];
 }
 
 void SanitizerMaskCutoffs::clear(SanitizerMask K) { set(K, 0); }

clang/test/Driver/fsanitize.c

@@ -1173,11 +1173,11 @@
 
 // Enable undefined, then cancel out integer using a cutoff of 0.0, then re-enable signed-integer-overflow
 // RUN: %clang -Werror --target=x86_64-linux-gnu -fsanitize=undefined -fno-sanitize-top-hot=undefined=0.5,integer=0.0,signed-integer-overflow=0.7 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-TOP-HOT4
-// CHECK-TOP-HOT4: "-fno-sanitize-top-hot={{((signed-integer-overflow|unreachable|return|vla-bound|alignment|null|pointer-overflow|float-cast-overflow|array-bounds|enum|bool|builtin|returns-nonnull-attribute|nonnull-attribute|function|vptr)=(0.5|0.49|0.7|0.69)([0-9]*),?){16}"}}
+// CHECK-TOP-HOT4: "-fno-sanitize-top-hot={{((signed-integer-overflow|unreachable|return|vla-bound|alignment|null|pointer-overflow|float-cast-overflow|array-bounds|enum|bool|builtin|returns-nonnull-attribute|nonnull-attribute|function|vptr)=0.[57]0*,?){16}"}}
 
 // Check that -fno-sanitize-top-hot=undefined=0.4 does not widen the set of -fsanitize=integer checks.
 // RUN: %clang -Werror --target=x86_64-linux-gnu -fsanitize=integer -fno-sanitize-top-hot=undefined=0.4 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-TOP-HOT5
-// CHECK-TOP-HOT5: "-fno-sanitize-top-hot={{((integer-divide-by-zero|shift-base|shift-exponent|signed-integer-overflow)=(0.4|0.39)([0-9]*),?){4}"}}
+// CHECK-TOP-HOT5: "-fno-sanitize-top-hot={{((integer-divide-by-zero|shift-base|shift-exponent|signed-integer-overflow)=0.40*,?){4}"}}
 
 // No-op: it's allowed for the user to specify a cutoff of 0.0, though the argument is not passed along by the driver.
 // RUN: %clang -Werror --target=x86_64-linux-gnu -fsanitize=undefined -fno-sanitize-top-hot=undefined=0.0 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-TOP-HOT6