[llvm] ce29a04 - Revert "Attempt to fix linking issue on the bot"

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2022-03-08T16:16:01-08:00
New Revision: ce29a0429b4cd02e9e1fec27ca3b8a04cce2a63c

URL: https://github.com/llvm/llvm-project/commit/ce29a0429b4cd02e9e1fec27ca3b8a04cce2a63c
DIFF: https://github.com/llvm/llvm-project/commit/ce29a0429b4cd02e9e1fec27ca3b8a04cce2a63c.diff

LOG: Revert "Attempt to fix linking issue on the bot"

The issue was fixed with 48c74bb2e2a72830f1068823bfc2f6fd4b53d427

This reverts commit ac423a8c8aa87a128e51f3690afc1405d06b8c9d.

Added: 
    

Modified: 
    llvm/lib/Transforms/Utils/SampleProfileInference.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Utils/SampleProfileInference.cpp b/llvm/lib/Transforms/Utils/SampleProfileInference.cpp
index 2d003e2e01a83..6f56f1c432c2e 100644
--- a/llvm/lib/Transforms/Utils/SampleProfileInference.cpp
+++ b/llvm/lib/Transforms/Utils/SampleProfileInference.cpp
@@ -173,7 +173,7 @@ class MinCostMaxFlow {
   /// A cost of taking an unlikely jump.
   static constexpr int64_t AuxCostUnlikely = ((int64_t)1) << 30;
   /// Minimum BaseDistance for the jump distance values in island joining.
-  static constexpr uint64_t MinBaseDistance = 10000ull;
+  static constexpr uint64_t MinBaseDistance = 10000;
 
 private:
   /// Iteratively find an augmentation path/dag in the network and send the
@@ -741,7 +741,7 @@ class FlowAdjuster {
   /// parts to a multiple of 1 / BaseDistance.
   int64_t jumpDistance(FlowJump *Jump) const {
     uint64_t BaseDistance =
-        std::max(MinCostMaxFlow::MinBaseDistance,
+        std::max(static_cast<uint64_t>(MinCostMaxFlow::MinBaseDistance),
                  std::min(Func.Blocks[Func.Entry].Flow,
                           MinCostMaxFlow::AuxCostUnlikely / NumBlocks()));
     if (Jump->IsUnlikely)