This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [C++ PATCH] Fix option handling when -std=gnu++14 is not used (PR 69865)
- From: Jakub Jelinek <jakub at redhat dot com>
- To: Bernd Edlinger <bernd dot edlinger at hotmail dot de>
- Cc: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>, Jason Merrill <jason at redhat dot com>, Jonathan Wakely <jwakely at redhat dot com>
- Date: Fri, 19 Feb 2016 16:22:43 +0100
- Subject: Re: [C++ PATCH] Fix option handling when -std=gnu++14 is not used (PR 69865)
- Authentication-results: sourceware.org; auth=none
- References: <HE1PR07MB090548A2180950184AF65A60E4A00 at HE1PR07MB0905 dot eurprd07 dot prod dot outlook dot com> <20160219105612 dot GA3017 at tucnak dot redhat dot com> <HE1PR07MB09054F1EE94A5C0E57E41AAEE4A00 at HE1PR07MB0905 dot eurprd07 dot prod dot outlook dot com> <20160219113126 dot GB3017 at tucnak dot redhat dot com> <HE1PR07MB09050AD7717125F4428FF773E4A00 at HE1PR07MB0905 dot eurprd07 dot prod dot outlook dot com> <20160219115945 dot GC3017 at tucnak dot redhat dot com> <20160219122212 dot GD3017 at tucnak dot redhat dot com> <20160219122646 dot GE3017 at tucnak dot redhat dot com> <HE1PR07MB0905E05119CA05C3C4652068E4A00 at HE1PR07MB0905 dot eurprd07 dot prod dot outlook dot com>
- Reply-to: Jakub Jelinek <jakub at redhat dot com>
On Fri, Feb 19, 2016 at 03:09:25PM +0000, Bernd Edlinger wrote:
> Hmm... wait a moment.
> How about that?
Guess it is mostly reasonable (still, this is C++ FE, so I'd prefer
Jason to ack it), except for:
> +#define libc_name_p Perfect_Hash::libc_name_p
this. Doesn't that cause
Perfect_Hash::libc_name_p (register const char *str, register unsigned int len)
to expand as
Perfect_Hash:: Perfect_Hash::libc_name_p (register const char *str, register unsigned int len)
?
So, I think better might be something like:
--- gcc/cp/Make-lang.in.jj 2016-01-04 14:55:57.000000000 +0100
+++ gcc/cp/Make-lang.in 2016-02-19 16:21:11.538734055 +0100
@@ -112,7 +112,7 @@ else
# deleting the $(srcdir)/cp/cfns.h file.
$(srcdir)/cp/cfns.h:
endif
- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \
$(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h
#
--- gcc/cp/except.c.jj 2016-01-04 14:55:57.000000000 +0100
+++ gcc/cp/except.c 2016-02-19 16:20:37.134205968 +0100
@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn)
unless the system headers are playing rename tricks, and if
they are, we don't want to be confused by them. */
id = DECL_NAME (fn);
- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
+ IDENTIFIER_LENGTH (id));
}
/* Returns nonzero if an exception of type FROM will be caught by a
--- gcc/cp/cfns.gperf.jj 2016-02-19 14:41:14.000000000 +0100
+++ gcc/cp/cfns.gperf 2016-02-19 16:19:34.841060418 +0100
@@ -1,3 +1,5 @@
+%language=C++
+%define class-name libc_name
%{
/* Copyright (C) 2000-2016 Free Software Foundation, Inc.
@@ -16,14 +18,6 @@ for more details.
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#ifdef __GNUC__
-__inline
-#endif
-static unsigned int hash (const char *, unsigned int);
-#ifdef __GNUC__
-__inline
-#endif
-const char * libc_name_p (const char *, unsigned int);
%}
%%
# The standard C library functions, for feeding to gperf; the result is used
--- gcc/cp/cfns.h.jj 2016-02-19 14:41:14.000000000 +0100
+++ gcc/cp/cfns.h 2016-02-19 16:19:53.533804017 +0100
@@ -1,5 +1,5 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */
+/* C++ code produced by gperf version 3.0.4 */
+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ cfns.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,7 @@
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
-#line 1 "cfns.gperf"
+#line 3 "cfns.gperf"
/* Copyright (C) 2000-2016 Free Software Foundation, Inc.
@@ -47,25 +47,18 @@ for more details.
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#ifdef __GNUC__
-__inline
-#endif
-static unsigned int hash (const char *, unsigned int);
-#ifdef __GNUC__
-__inline
-#endif
-const char * libc_name_p (const char *, unsigned int);
/* maximum key range = 391, duplicates = 0 */
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (register const char *str, register unsigned int len)
+class libc_name
+{
+private:
+ static inline unsigned int hash (const char *str, unsigned int len);
+public:
+ static const char *libc_name_p (const char *str, unsigned int len);
+};
+
+inline unsigned int
+libc_name::hash (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
@@ -122,14 +115,8 @@ hash (register const char *str, register
return hval + asso_values[(unsigned char)str[len - 1]];
}
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
const char *
-libc_name_p (register const char *str, register unsigned int len)
+libc_name::libc_name_p (register const char *str, register unsigned int len)
{
enum
{
Jakub