[llvm] [llvm] Fix 32bit build after change to implement S_INLINEES debug symbol (PR #67607)
Daniel Paoliello via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 27 14:37:49 PDT 2023
https://github.com/dpaoliello created https://github.com/llvm/llvm-project/pull/67607
PR !67490 broke 32bit builds by having mismatched types in a call to `std::min"
This change standardizes on using `size_t` to avoid the mismatch.
>From d8af471946b686dbc1f4f692c2c1b319388b410e Mon Sep 17 00:00:00 2001
From: Daniel Paoliello <danpao at microsoft.com>
Date: Wed, 27 Sep 2023 14:35:28 -0700
Subject: [PATCH] Fix inlinees
---
llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
index 335eccb106519ca..4ff056042c6f95e 100644
--- a/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
@@ -3597,14 +3597,14 @@ void CodeViewDebug::emitInlinees(
const SmallSet<codeview::TypeIndex, 1> &Inlinees) {
// Divide the list of inlinees into chunks such that each chunk fits within
// one record.
- constexpr auto ChunkSize =
+ constexpr size_t ChunkSize =
(MaxRecordLength - sizeof(SymbolKind) - sizeof(uint32_t)) /
sizeof(uint32_t);
SmallVector<TypeIndex> SortedInlinees{Inlinees.begin(), Inlinees.end()};
llvm::sort(SortedInlinees);
- uint64_t CurrentIndex = 0;
+ size_t CurrentIndex = 0;
while (CurrentIndex < SortedInlinees.size()) {
auto Symbol = beginSymbolRecord(SymbolKind::S_INLINEES);
auto CurrentChunkSize =
@@ -3612,7 +3612,7 @@ void CodeViewDebug::emitInlinees(
OS.AddComment("Count");
OS.emitInt32(CurrentChunkSize);
- const uint64_t CurrentChunkEnd = CurrentIndex + CurrentChunkSize;
+ const size_t CurrentChunkEnd = CurrentIndex + CurrentChunkSize;
for (; CurrentIndex < CurrentChunkEnd; ++CurrentIndex) {
OS.AddComment("Inlinee");
OS.emitInt32(SortedInlinees[CurrentIndex].getIndex());
More information about the llvm-commits
mailing list