From b753b37bd6a43a9d1cc2433f57a091c213380147 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Fri, 29 Aug 2014 15:28:45 +0000 Subject: [PATCH] macro.c (warn_of_redefinition): Suppress warnings for builtins that lack the NODE_WARN flag... MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit libcpp/ChangeLog: 2014-08-29 Manuel López-Ibáñez * macro.c (warn_of_redefinition): Suppress warnings for builtins that lack the NODE_WARN flag, unless Wbuiltin-macro-redefined. (_cpp_create_definition): Use Wbuiltin-macro-redefined for builtins that lack the NODE_WARN flag. * directives.c (do_undef): Likewise. * init.c (cpp_init_special_builtins): Do not change flags depending on Wbuiltin-macro-redefined. gcc/c-family/ChangeLog: 2014-08-29 Manuel López-Ibáñez * c.opt (Wbuiltin-macro-redefined): Use CPP, Var and Init. * c-opts.c (c_common_handle_option): Do not handle here. From-SVN: r214730 --- gcc/c-family/ChangeLog | 5 +++++ gcc/c-family/c-opts.c | 4 ---- gcc/c-family/c.opt | 2 +- libcpp/ChangeLog | 10 ++++++++++ libcpp/directives.c | 5 +++++ libcpp/init.c | 3 +-- libcpp/macro.c | 25 ++++++++++++------------- 7 files changed, 34 insertions(+), 20 deletions(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index fa11d68db39..400ea34becc 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2014-08-29 Manuel López-Ibáñez + + * c.opt (Wbuiltin-macro-redefined): Use CPP, Var and Init. + * c-opts.c (c_common_handle_option): Do not handle here. + 2014-08-25 Jason Merrill * c.opt: Change -std=c++1y and -std=gnu++1y to be aliases for diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 1b01b4fcaef..81b7c96bd18 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -385,10 +385,6 @@ c_common_handle_option (size_t scode, const char *arg, int value, cpp_opts->warn_num_sign_change = value; break; - case OPT_Wbuiltin_macro_redefined: - cpp_opts->warn_builtin_macro_redefined = value; - break; - case OPT_Wc___compat: cpp_opts->warn_cxx_operator_names = value; break; diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index d619250fc06..3a187087e7c 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -292,7 +292,7 @@ C ObjC C++ ObjC++ Var(warn_bool_compare) Warning LangEnabledBy(C ObjC C++ ObjC++ Warn about boolean expression compared with an integer value different from true/false Wbuiltin-macro-redefined -C ObjC C++ ObjC++ Warning +C ObjC C++ ObjC++ CPP(warn_builtin_macro_redefined) Var(cpp_warn_builtin_macro_redefined) Init(1) Warning Warn when a built-in preprocessor macro is undefined or redefined Wc90-c99-compat diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 7f88f7aa405..1516ec02c40 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,13 @@ +2014-08-29 Manuel López-Ibáñez + + * macro.c (warn_of_redefinition): Suppress warnings for builtins + that lack the NODE_WARN flag, unless Wbuiltin-macro-redefined. + (_cpp_create_definition): Use Wbuiltin-macro-redefined for + builtins that lack the NODE_WARN flag. + * directives.c (do_undef): Likewise. + * init.c (cpp_init_special_builtins): Do not change flags + depending on Wbuiltin-macro-redefined. + 2014-08-28 Edward Smith-Rowland <3dw4rd@verizon.net> PR cpp/23827 - standard C++ should not have hex float preprocessor diff --git a/libcpp/directives.c b/libcpp/directives.c index 3486a48d21e..631557df8bb 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -610,6 +610,11 @@ do_undef (cpp_reader *pfile) if (node->flags & NODE_WARN) cpp_error (pfile, CPP_DL_WARNING, "undefining \"%s\"", NODE_NAME (node)); + else if ((node->flags & NODE_BUILTIN) + && CPP_OPTION (pfile, warn_builtin_macro_redefined)) + cpp_warning_with_line (pfile, CPP_W_BUILTIN_MACRO_REDEFINED, + pfile->directive_line, 0, + "undefining \"%s\"", NODE_NAME (node)); if (CPP_OPTION (pfile, warn_unused_macros)) _cpp_warn_if_unused_macro (pfile, node, NULL); diff --git a/libcpp/init.c b/libcpp/init.c index 7aace802682..2998d880aa4 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -470,8 +470,7 @@ cpp_init_special_builtins (cpp_reader *pfile) cpp_hashnode *hp = cpp_lookup (pfile, b->name, b->len); hp->type = NT_MACRO; hp->flags |= NODE_BUILTIN; - if (b->always_warn_if_redefined - || CPP_OPTION (pfile, warn_builtin_macro_redefined)) + if (b->always_warn_if_redefined) hp->flags |= NODE_WARN; hp->value.builtin = (enum cpp_builtin_type) b->value; } diff --git a/libcpp/macro.c b/libcpp/macro.c index a1ba1373615..8445ce39eda 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -2699,13 +2699,12 @@ warn_of_redefinition (cpp_reader *pfile, cpp_hashnode *node, if (node->flags & NODE_WARN) return true; - /* Suppress warnings for builtins that lack the NODE_WARN flag. */ - if (node->flags & NODE_BUILTIN) - { - if (!pfile->cb.user_builtin_macro - || !pfile->cb.user_builtin_macro (pfile, node)) - return false; - } + /* Suppress warnings for builtins that lack the NODE_WARN flag, + unless Wbuiltin-macro-redefined. */ + if (node->flags & NODE_BUILTIN + && (!pfile->cb.user_builtin_macro + || !pfile->cb.user_builtin_macro (pfile, node))) + return CPP_OPTION (pfile, warn_builtin_macro_redefined); /* Redefinitions of conditional (context-sensitive) macros, on the other hand, must be allowed silently. */ @@ -3181,14 +3180,14 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node) if (warn_of_redefinition (pfile, node, macro)) { - const int reason = (node->flags & NODE_BUILTIN) + const int reason = ((node->flags & NODE_BUILTIN) + && !(node->flags & NODE_WARN)) ? CPP_W_BUILTIN_MACRO_REDEFINED : CPP_W_NONE; - bool warned; - warned = cpp_pedwarning_with_line (pfile, reason, - pfile->directive_line, 0, - "\"%s\" redefined", - NODE_NAME (node)); + bool warned = + cpp_pedwarning_with_line (pfile, reason, + pfile->directive_line, 0, + "\"%s\" redefined", NODE_NAME (node)); if (warned && node->type == NT_MACRO && !(node->flags & NODE_BUILTIN)) cpp_error_with_line (pfile, CPP_DL_NOTE, -- 2.30.2