commit fb9ff924d5db6a15eed134b9c9d4664128e1b1cf
author Fangrui Song <i@maskray.me> Sat Aug 06 16:44:14 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Aug 06 16:46:10 2022 -0700
tree 92b30c6c8405b2bb71145533805ff0f248af69d7
parent 429d1a9f1c212b0607130a9d1426772790871c91

Revert "[lld-macho] Work around odr-use of const non-inline static data member to fix -O0 build after D128298"

This reverts commit 20b2d3260d4a1878ca2a37cee6ee335a21a12d0f.
The workaround is no longer needed for C++17.

GitOrigin-RevId: bccdf9197b6d647ccf5bbc86b25e29278aebc4e5

MachO/SyntheticSections.cpp

diff --git a/MachO/SyntheticSections.cpp b/MachO/SyntheticSections.cpp
index 8e7ca52..e8a31f9 100644
--- a/MachO/SyntheticSections.cpp
+++ b/MachO/SyntheticSections.cpp
@@ -1307,8 +1307,7 @@
   uint8_t *hashes = buf + fileOff + allHeadersSize;
   parallelFor(0, getBlockCount(), [&](size_t i) {
     sha256(buf + i * blockSize,
-           std::min(static_cast<size_t>(fileOff - i * blockSize),
-                    static_cast<size_t>(blockSize)),
+           std::min(static_cast<size_t>(fileOff - i * blockSize), blockSize),
            hashes + i * hashSize);
   });
 #if defined(__APPLE__)