From patchwork Sat Oct 15 10:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1690290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MqKpW4rVlz23jk for ; Sat, 15 Oct 2022 21:52:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0A4D03860747 for ; Sat, 15 Oct 2022 10:52:25 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 5E5473858406; Sat, 15 Oct 2022 10:51:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5E5473858406 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.95,186,1661846400"; d="scan'208,223";a="84778099" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 15 Oct 2022 02:51:52 -0800 IronPort-SDR: TZ3M/nRR+1DSHgX1sas5f1cL3DwIM7RuATagWMLM+B6hGOrCO+4/f4eTiRZLrCcl/Yt82xmfuJ 7cq6HaR0Ooi4AIU1KsdoVByPmMGNsmXG2YXz5s5wM92X2eGk1r6LAkyP6dHLHQh33RQfFil8/K z1LYDDMFfjzX5IszPSlTGm8JB6S55Cg/g30MlS6AfCPEFaf13FzQycCE3zE7McEg3TKJNX+9Ju 01Agy6o7cvM0xSaTRF0Nd2RSI2d6//0ueBSSwZJ5AgAjJ8cBUxLRZSdMqhxy46EWL2LdDX3b7E QyI= From: Thomas Schwinge To: Jonathan Wakely , , Subject: libstdc++: Address '-Wunused-function' for 'print_raw' (was: [committed] libstdc++: Simplify print_raw function for debug assertions) In-Reply-To: <20221014143602.2512815-1-jwakely@redhat.com> References: <20221014143602.2512815-1-jwakely@redhat.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Sat, 15 Oct 2022 12:51:44 +0200 Message-ID: <87sfjps6kf.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2022-10-14T15:36:02+0100, Jonathan Wakely via Gcc-patches wrote: > Tested powerpc64le-linux. Pushed to trunk. > > -- >8 -- > > Replace two uses of print_raw where it's clearer to just use fprintf > directly. Then the only remaining use of print_raw is as the print_func > argument of pretty_print. OK to push the attached "libstdc++: Address '-Wunused-function' for 'print_raw'", or should this be addressed differently? Grüße Thomas > When called by pretty_print the count is > either a positive integer or -1, so we can simplify print_raw itself. > > Remove the default argument, because it's never used. Remove the check > for nbc == 0, which never happens (but would be harmless if it did). > Replace the conditional expression with a single call to fprintf, using > INT_MAX as the maximum length. > > libstdc++-v3/ChangeLog: > > * src/c++11/debug.cc (print_raw): Simplify. > (print_word): Print indentation by calling fprintf directly. > (_Error_formatter::_M_error): Print unindented string by calling > fprintf directly. > --- > libstdc++-v3/src/c++11/debug.cc | 21 ++++++++------------- > 1 file changed, 8 insertions(+), 13 deletions(-) > > diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc > index abc4124c01e..f2b25fbefce 100644 > --- a/libstdc++-v3/src/c++11/debug.cc > +++ b/libstdc++-v3/src/c++11/debug.cc > @@ -37,6 +37,7 @@ > #include // for std::abort > #include // for std::isspace. > #include // for std::strstr. > +#include // for INT_MAX > > #include // for std::min. > > @@ -609,14 +610,11 @@ namespace > { print_word(ctx, word, Length - 1); } > > void > - print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc = -1) > + print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc) > { > - if (nbc != 0) > - { > - ctx._M_column += (nbc > 0) > - ? fprintf(stderr, "%.*s", (int)nbc, str) > - : fprintf(stderr, "%s", str); > - } > + if (nbc == -1) > + nbc = INT_MAX; > + ctx._M_column += fprintf(stderr, "%.*s", (int)nbc, str); > } > > void > @@ -645,12 +643,9 @@ namespace > || (ctx._M_column + visual_length < ctx._M_max_length) > || (visual_length >= ctx._M_max_length && ctx._M_column == 1)) > { > - // If this isn't the first line, indent > + // If this isn't the first line, indent. > if (ctx._M_column == 1 && !ctx._M_first_line) > - { > - const char spacing[PrintContext::_S_indent + 1] = " "; > - print_raw(ctx, spacing, PrintContext::_S_indent); > - } > + ctx._M_column += fprintf(stderr, "%*c", PrintContext::_S_indent, ' '); > > int written = fprintf(stderr, "%.*s", (int)length, word); > > @@ -1166,7 +1161,7 @@ namespace __gnu_debug > PrintContext ctx; > if (_M_file) > { > - print_raw(ctx, _M_file); > + ctx._M_column += fprintf(stderr, "%s", _M_file); > print_literal(ctx, ":"); > go_to_next_line = true; > } ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 9ba7d0e6026ef4c3d095b0a57f9b88a87df403ea Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sat, 15 Oct 2022 12:15:58 +0200 Subject: [PATCH] libstdc++: Address '-Wunused-function' for 'print_raw' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per recent commit r13-3303-gcf0b7e9787c3686c47219a725f2cbcaa19faaaca "libstdc++: Simplify print_raw function for debug assertions": > Replace two uses of print_raw where it's clearer to just use fprintf > directly. Then the only remaining use of print_raw is as the print_func > argument of pretty_print. But that one is only compiled '#if _GLIBCXX_HAVE_STACKTRACE'. In a '--enable-werror' build I've thus run into: [...]/source-gcc/libstdc++-v3/src/c++11/debug.cc:613:3: error: ‘void {anonymous}::print_raw(PrintContext&, const char*, ptrdiff_t)’ defined but not used [-Werror=unused-function] 613 | print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc) | ^~~~~~~~~ cc1plus: all warnings being treated as errors libstdc++-v3/ * src/c++11/debug.cc (print_raw): Only '#if _GLIBCXX_HAVE_STACKTRACE'. --- libstdc++-v3/src/c++11/debug.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc index f2b25fbefce0..f62a1f755cf1 100644 --- a/libstdc++-v3/src/c++11/debug.cc +++ b/libstdc++-v3/src/c++11/debug.cc @@ -609,6 +609,7 @@ namespace print_literal(PrintContext& ctx, const char(&word)[Length]) { print_word(ctx, word, Length - 1); } +#if _GLIBCXX_HAVE_STACKTRACE void print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc) { @@ -616,6 +617,7 @@ namespace nbc = INT_MAX; ctx._M_column += fprintf(stderr, "%.*s", (int)nbc, str); } +#endif void print_word(PrintContext& ctx, const char* word, ptrdiff_t nbc = -1) -- 2.35.1