diff options
author | Fangrui Song <i@maskray.me> | 2022-08-06 16:48:23 -0700 |
---|---|---|
committer | Fangrui Song <i@maskray.me> | 2022-08-06 16:48:23 -0700 |
commit | 5deb678289df4a11d5c0786d702ad2730cd7e391 (patch) | |
tree | d4186872f31fe48941dc33f9a37bd62fe833aa06 | |
parent | bccdf9197b6d647ccf5bbc86b25e29278aebc4e5 (diff) |
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.
-rw-r--r-- | llvm/lib/Transforms/Utils/SampleProfileInference.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/SampleProfileInference.cpp b/llvm/lib/Transforms/Utils/SampleProfileInference.cpp index 5e92b9852a9f..d9005be2c8f3 100644 --- a/llvm/lib/Transforms/Utils/SampleProfileInference.cpp +++ b/llvm/lib/Transforms/Utils/SampleProfileInference.cpp @@ -740,7 +740,7 @@ private: /// 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) |