[BOLT] Fix ICPJumpTablesTopN option use

Fix non-sensical `opts::ICPJumpTablesTopN != 0 ? opts::ICPTopN : opts::ICPTopN`. Refactor/simplify another similar assignment. Reviewed By: rafauler Differential Revision: https://reviews.llvm.org/D124880
llvm · May 4, 2022 · 60957a5 · 60957a5
1 parent c3d5372
commit 60957a5
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/bolt/lib/Passes/IndirectCallPromotion.cpp b/bolt/lib/Passes/IndirectCallPromotion.cpp
@@ -546,7 +546,7 @@ IndirectCallPromotion::findCallTargetSymbols(std::vector<Callsite> &Targets,
     }
     uint64_t RemainingMemAccesses = TotalMemAccesses;
     const size_t TopN =
-        opts::ICPJumpTablesTopN != 0 ? opts::ICPTopN : opts::ICPTopN;
+        opts::ICPJumpTablesTopN ? opts::ICPJumpTablesTopN : opts::ICPTopN;
     size_t I = 0;
     for (; I < HotTargets.size(); ++I) {
       const uint64_t MemAccesses = HotTargets[I].first;
@@ -942,12 +942,11 @@ size_t IndirectCallPromotion::canPromoteCallsite(
   }
 
   size_t TopN = opts::ICPTopN;
-  if (IsJumpTable) {
-    if (opts::ICPJumpTablesTopN != 0)
-      TopN = opts::ICPJumpTablesTopN;
-  } else if (opts::ICPCallsTopN != 0) {
-    TopN = opts::ICPCallsTopN;
-  }
+  if (IsJumpTable)
+    TopN = opts::ICPJumpTablesTopN ? opts::ICPJumpTablesTopN : TopN;
+  else
+    TopN = opts::ICPCallsTopN ? opts::ICPCallsTopN : TopN;
+
   const size_t TrialN = TopN ? std::min(TopN, Targets.size()) : Targets.size();
 
   if (opts::ICPTopCallsites > 0) {