Skip to content

Commit

Permalink
Revert "[ProfileData] Use size_t in PatchItem (NFC) (#87014)"
Browse files Browse the repository at this point in the history
This reverts commit c64a328.
This broke Arm32 bit build on various LLVM buildbots.
For example:
https://lab.llvm.org/buildbot/#/builders/17/builds/51129
  • Loading branch information
omjavaid committed Mar 29, 2024
1 parent abfc5ef commit 80aa52d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions llvm/lib/ProfileData/InstrProfWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ using namespace llvm;
struct PatchItem {
uint64_t Pos; // Where to patch.
uint64_t *D; // Pointer to an array of source data.
size_t N; // Number of elements in \c D array.
int N; // Number of elements in \c D array.
};

namespace llvm {
Expand Down Expand Up @@ -69,7 +69,7 @@ class ProfOStream {
const uint64_t LastPos = FDOStream.tell();
for (const auto &K : P) {
FDOStream.seek(K.Pos);
for (size_t I = 0; I < K.N; I++)
for (int I = 0; I < K.N; I++)
write(K.D[I]);
}
// Reset the stream to the last position after patching so that users
Expand All @@ -80,7 +80,7 @@ class ProfOStream {
raw_string_ostream &SOStream = static_cast<raw_string_ostream &>(OS);
std::string &Data = SOStream.str(); // with flush
for (const auto &K : P) {
for (size_t I = 0; I < K.N; I++) {
for (int I = 0; I < K.N; I++) {
uint64_t Bytes =
endian::byte_swap<uint64_t, llvm::endianness::little>(K.D[I]);
Data.replace(K.Pos + I * sizeof(uint64_t), sizeof(uint64_t),
Expand Down Expand Up @@ -707,9 +707,9 @@ Error InstrProfWriter::writeImpl(ProfOStream &OS) {
{VTableNamesOffset, &VTableNamesSectionStart, 1},
// Patch the summary data.
{SummaryOffset, reinterpret_cast<uint64_t *>(TheSummary.get()),
SummarySize / sizeof(uint64_t)},
(int)(SummarySize / sizeof(uint64_t))},
{CSSummaryOffset, reinterpret_cast<uint64_t *>(TheCSSummary.get()),
CSSummarySize}};
(int)CSSummarySize}};

OS.patch(PatchItems);
} else {
Expand All @@ -727,9 +727,9 @@ Error InstrProfWriter::writeImpl(ProfOStream &OS) {
{TemporalProfTracesOffset, &TemporalProfTracesSectionStart, 1},
// Patch the summary data.
{SummaryOffset, reinterpret_cast<uint64_t *>(TheSummary.get()),
SummarySize / sizeof(uint64_t)},
(int)(SummarySize / sizeof(uint64_t))},
{CSSummaryOffset, reinterpret_cast<uint64_t *>(TheCSSummary.get()),
CSSummarySize}};
(int)CSSummarySize}};

OS.patch(PatchItems);
}
Expand Down

0 comments on commit 80aa52d

Please sign in to comment.