From patchwork Tue Mar 12 18:21:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 31830 Received: (qmail 87894 invoked by alias); 12 Mar 2019 18:21:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 87618 invoked by uid 89); 12 Mar 2019 18:21:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=U*$ X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 12 Mar 2019 18:21:48 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E3BD13A4D for ; Tue, 12 Mar 2019 18:21:47 +0000 (UTC) Received: from localhost.localdomain (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id E218C6684B for ; Tue, 12 Mar 2019 18:21:46 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH] For flex: define YY_FATAL_ERROR, rename fprintf -> parser_fprintf Date: Tue, 12 Mar 2019 18:21:45 +0000 Message-Id: <20190312182145.21611-1-palves@redhat.com> MIME-Version: 1.0 Switching GDB to make use of gnulib's C++ namespace support mode revealed these direct uses of fprintf in the Ada lexer: In file included from ..../src/gdb/ada-exp.y:731:0: ada-lex.c: In function ‘void yy_fatal_error(const char*)’: ada-lex.c:2358:41: error: call to ‘fprintf’ declared with attribute warning: The symbol ::fprintf refers to the system function. Use gnulib::fprintf instead. [-Werror] (void) fprintf( stderr, "%s\n", msg ); ^ The generated yy_fatal_error looks like this with flex 2.5.35: static void yy_fatal_error (yyconst char* msg ) { (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } We can define YY_FATAL_ERROR to override that default implementation. I think it's a good idea to do that and call internal_error instead of exiting gdb, so this is what this patch does. However, the default implementation is still generated and unconditionally compiled in, so we need to handle that fprintf somehow too. gnulib's C++ namespace support adds that useful warning shown above, breaking the build if we don't do anything here. So this commit uses sed to replace fprintf calls with parser_fprintf calls, like we already do to rewire malloc to xmalloc, etc. gdb/ChangeLog: yyyy-mm-dd Pedro Alves * Makefile.in (.l.c): Replace fprintf calls with parser_fprintf calls. * yy-remap.h (YY_FATAL_ERROR): Define. --- gdb/Makefile.in | 28 ++++++++++++++++++++++++---- gdb/yy-remap.h | 2 ++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 5614cc3386..aa01c8d38e 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2457,10 +2457,28 @@ po/$(PACKAGE).pot: force # LANG-exp.c is generated in objdir from LANG-exp.y if it doesn't # exist in srcdir, then compiled in objdir to LANG-exp.o. If we # said LANG-exp.c rather than ./c-exp.c some makes would -# sometimes re-write it into $(srcdir)/c-exp.c. Remove bogus -# decls for malloc/realloc/free which conflict with everything else. -# Strictly speaking c-exp.c should therefore depend on -# Makefile.in, but that was a pretty big annoyance. +# sometimes re-write it into $(srcdir)/c-exp.c. +# +# Remove bogus decls for malloc/realloc/free which conflict with +# everything else. +# +# Replace calls to fprintf in order to redirect stderr -> gdb_stderr. +# +# We define YY_FATAL_ERROR to hook in our replacement, however, flex +# still defines the default version anyway, as a static function, +# leading to -Wunused-function warnings, like: +# +# ada-lex.c:2329:13: error: ‘void yy_fatal_error(const char*)’ defined but not used [-Werror=unused-function] +# +# Observed with flex 2.5.35. And then with flex 2.6.1 we have: +# +# ada-lex.c:#define yynoreturn __attribute__((__noreturn__)) +# ada-lex.c:static void yynoreturn yy_fatal_error (yyconst char* msg ) +# +# Fix that by injecting ATTRIBUTE_UNUSED into yy_fatal_error's prototype. +# +# Strictly speaking c-exp.c should therefore depend on Makefile.in, +# but that was a pretty big annoyance. %.c: %.y $(ECHO_YACC) $(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- \ @@ -2489,6 +2507,8 @@ po/$(PACKAGE).pot: force -e 's/\([ \t;,(]\)free\([ \t]*[&(),]\)/\1xfree\2/g' \ -e 's/\([ \t;,(]\)free$$/\1xfree/g' \ -e 's/yy_flex_xrealloc/yyxrealloc/g' \ + -e 's/\([ \t;,(]\)fprintf/\1parser_fprintf/g' \ + -e 's/\(static void\) \(yynoreturn \)\?\(yy_fatal_error\)/\1 ATTRIBUTE_UNUSED \2\3/g' \ > $@.new && \ mv $@.new $@ diff --git a/gdb/yy-remap.h b/gdb/yy-remap.h index cdd0aae8c6..ba62adbbfd 100644 --- a/gdb/yy-remap.h +++ b/gdb/yy-remap.h @@ -96,4 +96,6 @@ # define YYFPRINTF parser_fprintf #endif +#define YY_FATAL_ERROR(msg) internal_error (__FILE__, __LINE__, msg) + #endif /* YY_REMAP_H */