Skip to content

[Runtime] Fix format string warnings in Errors.cpp and Exclusivity.cpp when built for 32-bit. #16847

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 1 commit into from
May 29, 2018
Merged

[Runtime] Fix format string warnings in Errors.cpp and Exclusivity.cpp when built for 32-bit. #16847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion stdlib/public/runtime/Errors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void swift::dumpStackTraceEntry(unsigned index, void *framePC,
fprintf(stderr, "%s`%s + %td", libraryName.data(), symbolName.c_str(),
offset);
} else {
constexpr const char *format = "%-4u %-34s 0x%0.16tx %s + %td\n";
constexpr const char *format = "%-4u %-34s 0x%0.16" PRIxPTR " %s + %td\n";
fprintf(stderr, format, index, libraryName.data(), symbolAddr,
symbolName.c_str(), offset);
}
Expand Down
4 changes: 2 additions & 2 deletions stdlib/public/runtime/Exclusivity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void reportExclusivityConflict(ExclusivityFlags oldAction, void *oldPC,
constexpr unsigned maxAccessDescriptionLength = 50;
char message[maxMessageLength];
snprintf(message, sizeof(message),
"Simultaneous accesses to 0x%tx, but modification requires "
"Simultaneous accesses to 0x%" PRIxPTR ", but modification requires "
"exclusive access",
reinterpret_cast<uintptr_t>(pointer));
fprintf(stderr, "%s.\n", message);
Expand All @@ -102,7 +102,7 @@ static void reportExclusivityConflict(ExclusivityFlags oldAction, void *oldPC,
fprintf(stderr, "%s ", oldAccess);
if (oldPC) {
dumpStackTraceEntry(0, oldPC, /*shortOutput=*/true);
fprintf(stderr, " (0x%tx).\n", reinterpret_cast<uintptr_t>(oldPC));
fprintf(stderr, " (0x%" PRIxPTR ").\n", reinterpret_cast<uintptr_t>(oldPC));
} else {
fprintf(stderr, "<unknown>.\n");
}
Expand Down