Skip to content

Fix ildasm output on Linux by replacing I64 format specifiers with PRIx64 #121687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 18, 2025
+13 −13
Merged

Fix ildasm output on Linux by replacing I64 format specifiers with PRIx64 #121687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca59548
Initial plan
Copilot Nov 16, 2025
a136403
Fix I64x format specifiers to use standard PRIx64 macros
Copilot Nov 16, 2025
ff01ff5
Remove cinttypes include to fix Windows build
Copilot Nov 16, 2025
9f3189a
Fix I64 format specifiers in debug logging, JIT diagnostics, and tests
Copilot Nov 17, 2025
4666e3f
Use %p format specifier for HANDLE in debug logging
Copilot Nov 17, 2025
a21cfb4
Fix linux-musl build by using %zx for size_t values
Copilot Nov 17, 2025
e0c181c
Revert changes to all files except dasm.cpp and mdinfo.cpp
Copilot Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/coreclr/ildasm/dasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5460,9 +5460,9 @@ void DumpMetadataHeader(const char *szName, IMAGE_DATA_DIRECTORY *pDir, void* GU
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// 0x%02x Rid", pMDSH->Rid);
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016I64x MaskValid", (ULONGLONG)GET_UNALIGNED_VAL64(&(pMDSH->MaskValid)));
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016" PRIx64 " MaskValid", (uint64_t)GET_UNALIGNED_VAL64(&(pMDSH->MaskValid)));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016I64x Sorted", (ULONGLONG)GET_UNALIGNED_VAL64(&(pMDSH->Sorted)));
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016" PRIx64 " Sorted", (uint64_t)GET_UNALIGNED_VAL64(&(pMDSH->Sorted)));
printLine(GUICookie,szStr);
}
}
Expand Down Expand Up @@ -5680,7 +5680,7 @@ void DumpHeader(IMAGE_COR20_HEADER *CORHeader, void* GUICookie)
dwEntryPointSize = 12;
sprintf_s(szString,SZSTRING_SIZE,"// Base of code: 0x%08x", VAL32(pOptHeader->BaseOfCode));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// Image base: 0x%016I64x", VAL64(pOptHeader->ImageBase));
sprintf_s(szString,SZSTRING_SIZE,"// Image base: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->ImageBase));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// Section alignment: 0x%08x", VAL32(pOptHeader->SectionAlignment));
printLine(GUICookie,szStr);
Expand Down Expand Up @@ -5708,13 +5708,13 @@ void DumpHeader(IMAGE_COR20_HEADER *CORHeader, void* GUICookie)
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// DLL characteristics: 0x%04x", VAL16(pOptHeader->DllCharacteristics));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack reserve: 0x%016I64x", VAL64(pOptHeader->SizeOfStackReserve));
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack reserve: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfStackReserve));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack commit: 0x%016I64x", VAL64(pOptHeader->SizeOfStackCommit));
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack commit: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfStackCommit));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap reserve: 0x%016I64x", VAL64(pOptHeader->SizeOfHeapReserve));
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap reserve: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfHeapReserve));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap commit: 0x%016I64x", VAL64(pOptHeader->SizeOfHeapCommit));
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap commit: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfHeapCommit));
printLine(GUICookie,szStr);
sprintf_s(szString,SZSTRING_SIZE,"// Loader flags: 0x%08x", VAL32(pOptHeader->LoaderFlags));
printLine(GUICookie,szStr);
Expand Down Expand Up @@ -6747,12 +6747,12 @@ void DumpVtable(void* GUICookie)
pNTHeader64 = g_pPELoader->ntHeaders64();
pOptHeader64 = &pNTHeader64->OptionalHeader;

sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016I64x", g_szAsmCodeIndent,KEYWORD(".imagebase"),VAL64(pOptHeader64->ImageBase));
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016" PRIx64, g_szAsmCodeIndent,KEYWORD(".imagebase"),(uint64_t)VAL64(pOptHeader64->ImageBase));
printLine(GUICookie,szString);
j = VAL16(pOptHeader64->Subsystem);
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%08x", g_szAsmCodeIndent,KEYWORD(".file alignment"),VAL32(pOptHeader64->FileAlignment));
printLine(GUICookie,szString);
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016I64x", g_szAsmCodeIndent,KEYWORD(".stackreserve"),VAL64(pOptHeader64->SizeOfStackReserve));
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016" PRIx64, g_szAsmCodeIndent,KEYWORD(".stackreserve"),(uint64_t)VAL64(pOptHeader64->SizeOfStackReserve));
printLine(GUICookie,szString);
}
szptr = &szString[0];
Expand Down Expand Up @@ -6867,7 +6867,7 @@ void DumpVtable(void* GUICookie)
}
else
{
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," %016I64X", VAL64(*(uint64_t *)pSlot));
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," %016" PRIX64, (uint64_t)VAL64(*(uint64_t *)pSlot));
pSlot += sizeof(uint64_t);
}
if (g_prVTableRef == NULL)
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/tools/metainfo/mdinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3948,10 +3948,10 @@ void MDInfo::DumpRaw(int iDump, bool bunused)
const MD *pMd;
pMd = (const MD *)pbMd;

VWriteLine("Metadata header: %d.%d, heaps: 0x%02x, rid: 0x%02x, valid: 0x%016I64x, sorted: 0x%016I64x",
VWriteLine("Metadata header: %d.%d, heaps: 0x%02x, rid: 0x%02x, valid: 0x%016" PRIx64 ", sorted: 0x%016" PRIx64,
pMd->m_major, pMd->m_minor, pMd->m_heaps, pMd->m_rid,
(ULONGLONG)GET_UNALIGNED_VAL64(&(pMd->m_maskvalid)),
(ULONGLONG)GET_UNALIGNED_VAL64(&(pMd->m_sorted)));
(uint64_t)GET_UNALIGNED_VAL64(&(pMd->m_maskvalid)),
(uint64_t)GET_UNALIGNED_VAL64(&(pMd->m_sorted)));

if (m_DumpFilter & dumpMoreHex)
{
Expand Down
Loading