[BOLT] [Passes] Fix two compile warnings in BOLT

[gz83]

Fix build issue on Windows.

issue:#73085

@maksfb PTAL thank you

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[gz83]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff 2c875719c841ff13b9b250e6ea97fc3e0aca2070 39d188b197b165898a3f2caaa819abdcf646c17d -- bolt/lib/Passes/IndirectCallPromotion.cpp bolt/lib/Passes/ReorderAlgorithm.cpp

View the diff from clang-format here.

diff --git a/bolt/lib/Passes/IndirectCallPromotion.cpp b/bolt/lib/Passes/IndirectCallPromotion.cpp
index 555258f072..260b96ba02 100644
--- a/bolt/lib/Passes/IndirectCallPromotion.cpp
+++ b/bolt/lib/Passes/IndirectCallPromotion.cpp
@@ -410,7 +410,8 @@ IndirectCallPromotion::maybeGetHotJumpTableTargets(BinaryBasicBlock &BB,
            << "BaseReg = " << BC.MRI->getName(BaseReg) << ", "
            << "IndexReg = " << BC.MRI->getName(IndexReg) << ", "
            << "DispValue = " << Twine::utohexstr(DispValue) << ", "
-           << "DispExpr = " << DispExpr << ", " << "MemLocInstr = ";
+           << "DispExpr = " << DispExpr << ", "
+           << "MemLocInstr = ";
     BC.printInstruction(dbgs(), *MemLocInstr, 0, &Function);
     dbgs() << "\n";
   });

I use clang-format -i -style=file bolt\lib\Passes\IndirectCallPromotion.cpp and clang-format -i -style=file bolt\lib\Passes\ReorderAlgorithm.cpp to format the code

[gz83]

friendly ping

[rafaelauler]

This is not the same. This will run verifyProfile(), which will cause an unnecessary slow down in no-debug mode. The previous code wasn't running anything, it was just making a reference to silence a compiler warning about verifyProfile being unused.

I believe the proper fix is actually to surround the definition of verifyProfile in #ifndef NDEBUG..#endif in the same way as it is use is.

[gz83]

Thank you for your review. Do you mean I need to delete this line of code?

@rafaelauler

[rafaelauler]

Correct. Delete the line entirely and surround the definition of verifyProfile with #ifndef, like that:

#ifndef NDEBUG
definition goes here
#endif

[rafaelauler]

Github doesn't let me comment on unchanged code, but line 161 would look like this:

#ifndef NDEBUG
static bool verifyProfile(std::map<uint64_t, BinaryFunction> &BFs) {
  bool IsValid = true;
  for (auto &BFI : BFs) {
    BinaryFunction &BF = BFI.second;
    if (!BF.isSimple())
      continue;
    for (const BinaryBasicBlock &BB : BF) {
      auto BI = BB.branch_info_begin();
      for (BinaryBasicBlock *SuccBB : BB.successors()) {
        if (BI->Count != BinaryBasicBlock::COUNT_NO_PROFILE && BI->Count > 0) {
          if (BB.getKnownExecutionCount() == 0 ||
              SuccBB->getKnownExecutionCount() == 0) {
            errs() << "BOLT-WARNING: profile verification failed after ICP for "
                      "function "
                   << BF << '\n';
            IsValid = false;
          }
        }
        ++BI;
      }
    }
  }
  return IsValid;
}
#endif

[gz83]

The code has been modified, please review it, thank you!

@rafaelauler

[rafaelauler]

Thanks!

[gz83]

Thanks!

Please help me merge it, thank you!

@rafaelauler