More reviewer feedback

Author: thurstond

clang/lib/Basic/Sanitizers.cpp

@@ -46,17 +46,17 @@ void SanitizerMaskCutoffs::clear(SanitizerMask K) { set(K, 0); }
 
 std::optional<std::vector<int>>
 SanitizerMaskCutoffs::getAllScaled(int ScalingFactor) const {
-  std::vector<int> scaledCutoffs;
+  std::vector<int> ScaledCutoffs;
 
-  bool anyNonZero = false;
+  bool AnyCutoff = false;
   for (unsigned int i = 0; i < SanitizerKind::SO_Count; ++i) {
-    int scaled = round((operator[](i)).value_or(0) * ScalingFactor);
-    scaledCutoffs.push_back(scaled);
-    anyNonZero |= (scaled != 0);
+    auto C = (*this)[i];
+    ScaledCutoffs.push_back(C.has_value() ? lround(ScalingFactor * *C) : 0);
+    AnyCutoff |= C.has_value();
   }
 
-  if (anyNonZero)
-    return scaledCutoffs;
+  if (AnyCutoff)
+    return ScaledCutoffs;
 
   return std::nullopt;
 }

clang/lib/CodeGen/BackendUtil.cpp

@@ -797,27 +797,22 @@ static void addSanitizers(const Triple &TargetTriple,
 
   // SanitizeSkipHotCutoffs: doubles with range [0, 1]
   // Opts.cutoffs: ints with range [0, 1000000]
-  std::optional<std::vector<int>> scaledCutoffs =
+  std::optional<std::vector<int>> ScaledCutoffs =
       CodeGenOpts.SanitizeSkipHotCutoffs.getAllScaled(1000000);
 
   // TODO: remove IsRequested()
-  if (LowerAllowCheckPass::IsRequested() || scaledCutoffs.has_value()) {
+  if (LowerAllowCheckPass::IsRequested() || ScaledCutoffs.has_value()) {
     // We want to call it after inline, which is about OptimizerEarlyEPCallback.
     PB.registerOptimizerEarlyEPCallback([&](ModulePassManager &MPM,
                                             OptimizationLevel Level,
                                             ThinOrFullLTOPhase Phase) {
       LowerAllowCheckPass::Options Opts;
 
-      // TODO: after removing IsRequested(), the if case will be unconditional
-      if (scaledCutoffs.has_value()) {
+      // TODO: after removing IsRequested(), make this unconditional
+      if (ScaledCutoffs.has_value())
         // Copy from std::vector<int> to std::vector<unsigned int>
-        Opts.cutoffs = {scaledCutoffs.value().begin(),
-                        scaledCutoffs.value().end()};
-      } else {
-        for (unsigned int i = 0; i < SanitizerKind::SO_Count; ++i) {
-          Opts.cutoffs.push_back(0);
-        }
-      }
+        Opts.cutoffs = {ScaledCutoffs.value().begin(),
+                        ScaledCutoffs.value().end()};
 
       MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass(Opts)));
     });