Skip to content

[Demangler] Fix a couple of warnings. #60307

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.

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
Aug 8, 2022
Merged
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions lib/Demangling/Errors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ static int demangle_asprintf(char **strp, const char *format, ...) {

// -- Implementation ---------------------------------------------------------

SWIFT_VFORMAT(2)
static SWIFT_NORETURN void demangleFatal(uint32_t flags, const char *format,
va_list val) {
char *message;
Expand All @@ -172,6 +173,7 @@ static SWIFT_NORETURN void demangleFatal(uint32_t flags, const char *format,
abort();
}

SWIFT_VFORMAT(2)
static void demangleWarn(uint32_t flags, const char *format, va_list val) {
char *message;

Expand All @@ -190,13 +192,15 @@ namespace swift {
namespace Demangle {
SWIFT_BEGIN_INLINE_NAMESPACE

SWIFT_FORMAT(2, 3)
SWIFT_NORETURN void fatal(uint32_t flags, const char *format, ...) {
va_list val;

va_start(val, format);
fatalv(flags, format, val);
}

SWIFT_FORMAT(2, 3)
void warn(uint32_t flags, const char *format, ...) {
va_list val;

Expand All @@ -205,10 +209,12 @@ void warn(uint32_t flags, const char *format, ...) {
va_end(val);
}

SWIFT_VFORMAT(2)
SWIFT_NORETURN void fatalv(uint32_t flags, const char *format, va_list val) {
demangleFatal(flags, format, val);
}

SWIFT_VFORMAT(2)
void warnv(uint32_t flags, const char *format, va_list val) {
demangleWarn(flags, format, val);
}
Expand Down