From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 270C13858C98; Mon, 15 Apr 2024 15:23:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 270C13858C98 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1713194588; bh=EI9HihRH4KMp1yHajsgsKelulpvgL9BCmxZHTVFwxg0=; h=From:To:Subject:Date:From; b=hE9bMMhSXGRdSNZgnNIOR0jj7LbiqCwe/RhQI00/76SuGuyMqA/3+fhpWbws8SZY2 esIDoViLXbemmddl3R27Yw/QkL8RwJSb2Bgvc5QcB1kRdG4d4OA+bNPj078cz2Z+ZR fy3pUOI+Vt6CSu+IqbSbNcaaXBm4Hw2LPvlNY2P4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Avoid complaint warning on mingw X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: bdcd50f901e3db5b773b6462813a50b9649aad57 X-Git-Newrev: 75670e0075df0f6fc8c324ea11de193a038274d6 Message-Id: <20240415152308.270C13858C98@sourceware.org> Date: Mon, 15 Apr 2024 15:23:08 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D75670e0075df= 0f6fc8c324ea11de193a038274d6 commit 75670e0075df0f6fc8c324ea11de193a038274d6 Author: Tom Tromey Date: Tue Apr 9 08:54:58 2024 -0600 Avoid complaint warning on mingw =20 The mingw build currently issues a warning: =20 ./../../src/gdb/utils.h:378:56: warning: ignoring attributes on templat= e argument 'void(const char*, va_list)' {aka 'void(const char*, char*)'} [-= Wignored-attributes] =20 This patch fixes the problem as suggested by Simon: =20 https://sourceware.org/pipermail/gdb-patches/2024-April/207908.html =20 ...that is, by changing the warning interceptor to a class with a single 'warn' method. =20 Approved-By: Simon Marchi Diff: --- gdb/complaints.c | 8 ++++---- gdb/complaints.h | 6 +++--- gdb/dwarf2/cooked-index.c | 2 +- gdb/utils.c | 2 +- gdb/utils.h | 38 ++++++++++++++++++-------------------- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/gdb/complaints.c b/gdb/complaints.c index e375c734884..d3c72df6d41 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -58,7 +58,7 @@ complaint_internal (const char *fmt, ...) =20 warning_hook_handler handler =3D get_warning_hook_handler (); if (handler !=3D nullptr) - handler (fmt, args); + handler->warn (fmt, args); else { gdb_puts (_("During symbol reading: "), gdb_stderr); @@ -85,7 +85,7 @@ thread_local complaint_interceptor *complaint_interceptor= ::g_complaint_intercept =20 complaint_interceptor::complaint_interceptor () : m_saved_complaint_interceptor (&g_complaint_interceptor, this), - m_saved_warning_hook (issue_complaint) + m_saved_warning_hook (this) { } =20 @@ -96,7 +96,7 @@ wrap_warning_hook (warning_hook_handler hook, ...) { va_list args; va_start (args, hook); - hook ("%s", args); + hook->warn ("%s", args); va_end (args); } =20 @@ -121,7 +121,7 @@ re_emit_complaints (const complaint_collection &complai= nts) /* See complaints.h. */ =20 void -complaint_interceptor::issue_complaint (const char *fmt, va_list args) +complaint_interceptor::warn (const char *fmt, va_list args) { #if CXX_STD_THREAD std::lock_guard guard (complaint_mutex); diff --git a/gdb/complaints.h b/gdb/complaints.h index 8ac4c5034ee..995c35e0ab0 100644 --- a/gdb/complaints.h +++ b/gdb/complaints.h @@ -70,7 +70,7 @@ typedef std::unordered_set complaint_collect= ion; the main thread). Messages can be re-emitted on the main thread using re_emit_complaints, see below. */ =20 -class complaint_interceptor +class complaint_interceptor final : public warning_hook_handler_type { public: =20 @@ -94,8 +94,8 @@ private: =20 /* A helper function that is used by the 'complaint' implementation to issue a complaint. */ - static void issue_complaint (const char *, va_list) - ATTRIBUTE_PRINTF (1, 0); + void warn (const char *, va_list) override + ATTRIBUTE_PRINTF (2, 0); =20 /* This object. Used by the static callback function. */ static thread_local complaint_interceptor *g_complaint_interceptor; diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index 66822b575ca..cb0d1f3cd47 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -589,7 +589,7 @@ cooked_index_worker::write_to_cache (const cooked_index= *idx, See PR symtab/30837. This arranges to capture all such warnings. This is safe because we know the deferred_warnings object isn't in use by any other thread at this point. */ - scoped_restore_warning_hook defer (*warn); + scoped_restore_warning_hook defer (warn); m_cache_store.store (); } } diff --git a/gdb/utils.c b/gdb/utils.c index ded03c74099..6a77f6be713 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -164,7 +164,7 @@ void vwarning (const char *string, va_list args) { if (warning_hook !=3D nullptr) - warning_hook (string, args); + warning_hook->warn (string, args); else { std::optional term_s= tate; diff --git a/gdb/utils.h b/gdb/utils.h index 875a2583179..96350890a97 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -374,8 +374,19 @@ assign_return_if_changed (T &lval, const T &val) return true; } =20 -/* A function that can be used to intercept warnings. */ -typedef gdb::function_view warning_hook_hand= ler; +/* A class that can be used to intercept warnings. A class is used + here, rather than a gdb::function_view because it proved difficult + to use a function view in conjunction with ATTRIBUTE_PRINTF in a + way that would satisfy all compilers on all systems. And, even + though gdb only ever uses deferred_warnings here, a virtual + function is used to help Insight. */ +struct warning_hook_handler_type +{ + virtual void warn (const char *format, va_list args) ATTRIBUTE_PRINTF (2= , 0) + =3D 0; +}; + +typedef warning_hook_handler_type *warning_hook_handler; =20 /* Set the thread-local warning hook, and restore the old value when finished. */ @@ -418,7 +429,7 @@ extern warning_hook_handler get_warning_hook_handler (); instance of this class with the 'warn' function, and all warnings can be emitted with a single call to 'emit'. */ =20 -struct deferred_warnings +struct deferred_warnings final : public warning_hook_handler_type { deferred_warnings () : m_can_style (gdb_stderr->can_emit_style_escape ()) @@ -426,36 +437,23 @@ struct deferred_warnings } =20 /* Add a warning to the list of deferred warnings. */ - void warn (const char *format, ...) ATTRIBUTE_PRINTF(2,3) + void warn (const char *format, ...) ATTRIBUTE_PRINTF (2, 3) { - /* Generate the warning text into a string_file. */ - string_file msg (m_can_style); - va_list args; va_start (args, format); - msg.vprintf (format, args); + this->warn (format, args); va_end (args); - - /* Move the text into the list of deferred warnings. */ - m_warnings.emplace_back (std::move (msg)); } =20 /* A variant of 'warn' so that this object can be used as a warning hook; see scoped_restore_warning_hook. Note that no locking is done, so users have to be careful to only install this into a single thread at a time. */ - void operator() (const char *format, va_list args) + void warn (const char *format, va_list args) override + ATTRIBUTE_PRINTF (2, 0) { string_file msg (m_can_style); - /* Clang warns if we add ATTRIBUTE_PRINTF to this method (because - the function-view wrapper doesn't also have the attribute), but - then warns again if we remove it, because this vprintf call - does not use a literal format string. So, suppress the - warnings here. */ - DIAGNOSTIC_PUSH - DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL msg.vprintf (format, args); - DIAGNOSTIC_POP m_warnings.emplace_back (std::move (msg)); }