commit c1994972438f3c054f9ded8b710d91e3a0c93775
author Fangrui Song <i@maskray.me> Sat Aug 06 16:48:23 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Aug 06 16:51:31 2022 -0700
tree 0d19616e879de23e61c8a60786eb24142a61381d
parent d51509c4999d7908ce075ae7434f1dea89cb3fe1

Revert "[SampleProfileInference] Work around odr-use of const non-inline static data member to fix -O0 builds after D120508"

This reverts commit 48c74bb2e2a72830f1068823bfc2f6fd4b53d427.
With C++17 the workaround is no longer needed.

GitOrigin-RevId: 5deb678289df4a11d5c0786d702ad2730cd7e391

lib/Transforms/Utils/SampleProfileInference.cpp

diff --git a/lib/Transforms/Utils/SampleProfileInference.cpp b/lib/Transforms/Utils/SampleProfileInference.cpp
index 5e92b98..d9005be 100644
--- a/lib/Transforms/Utils/SampleProfileInference.cpp
+++ b/lib/Transforms/Utils/SampleProfileInference.cpp
@@ -740,7 +740,7 @@
   /// parts to a multiple of 1 / BaseDistance.
   int64_t jumpDistance(FlowJump *Jump) const {
     uint64_t BaseDistance =
-        std::max(static_cast<uint64_t>(MinCostMaxFlow::MinBaseDistance),
+        std::max(MinCostMaxFlow::MinBaseDistance,
                  std::min(Func.Blocks[Func.Entry].Flow,
                           MinCostMaxFlow::AuxCostUnlikely / NumBlocks()));
     if (Jump->IsUnlikely)