projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bccdf91
)
Revert "[SampleProfileInference] Work around odr-use of const non-inline static data...
author
Fangrui Song
<i@maskray.me>
Sat, 6 Aug 2022 23:48:23 +0000
(16:48 -0700)
committer
Fangrui Song
<i@maskray.me>
Sat, 6 Aug 2022 23:48:23 +0000
(16:48 -0700)
This reverts commit
48c74bb2e2a72830f1068823bfc2f6fd4b53d427
.
With C++17 the workaround is no longer needed.
llvm/lib/Transforms/Utils/SampleProfileInference.cpp
patch
|
blob
|
history
diff --git
a/llvm/lib/Transforms/Utils/SampleProfileInference.cpp
b/llvm/lib/Transforms/Utils/SampleProfileInference.cpp
index
5e92b98
..
d9005be
100644
(file)
--- 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)