Skip to content

Commit ed5d321

Browse files
authored
Merge pull request #16847 from mikeash/fix-format-warnings
[Runtime] Fix format string warnings in Errors.cpp and Exclusivity.cpp when built for 32-bit.
2 parents 6e99dfd + 9638cb8 commit ed5d321

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

stdlib/public/runtime/Errors.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void swift::dumpStackTraceEntry(unsigned index, void *framePC,
171171
fprintf(stderr, "%s`%s + %td", libraryName.data(), symbolName.c_str(),
172172
offset);
173173
} else {
174-
constexpr const char *format = "%-4u %-34s 0x%0.16tx %s + %td\n";
174+
constexpr const char *format = "%-4u %-34s 0x%0.16" PRIxPTR " %s + %td\n";
175175
fprintf(stderr, format, index, libraryName.data(), symbolAddr,
176176
symbolName.c_str(), offset);
177177
}

stdlib/public/runtime/Exclusivity.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static void reportExclusivityConflict(ExclusivityFlags oldAction, void *oldPC,
9191
constexpr unsigned maxAccessDescriptionLength = 50;
9292
char message[maxMessageLength];
9393
snprintf(message, sizeof(message),
94-
"Simultaneous accesses to 0x%tx, but modification requires "
94+
"Simultaneous accesses to 0x%" PRIxPTR ", but modification requires "
9595
"exclusive access",
9696
reinterpret_cast<uintptr_t>(pointer));
9797
fprintf(stderr, "%s.\n", message);
@@ -102,7 +102,7 @@ static void reportExclusivityConflict(ExclusivityFlags oldAction, void *oldPC,
102102
fprintf(stderr, "%s ", oldAccess);
103103
if (oldPC) {
104104
dumpStackTraceEntry(0, oldPC, /*shortOutput=*/true);
105-
fprintf(stderr, " (0x%tx).\n", reinterpret_cast<uintptr_t>(oldPC));
105+
fprintf(stderr, " (0x%" PRIxPTR ").\n", reinterpret_cast<uintptr_t>(oldPC));
106106
} else {
107107
fprintf(stderr, "<unknown>.\n");
108108
}

0 commit comments

Comments
 (0)