diff options
| author | Marek Polacek <polacek@redhat.com> | 2014-08-19 05:34:31 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2014-08-19 05:34:31 +0000 |
| commit | 177cce463d56f7a0e1900c59b80307b43b1483d8 (patch) | |
| tree | edb34abe06088024ce40380f1b5573f991d29584 /gcc/c/c-parser.c | |
| parent | 010ea2883c070de96be645d43874dfd9b4b0a85b (diff) | |
| download | gcc-177cce463d56f7a0e1900c59b80307b43b1483d8.zip gcc-177cce463d56f7a0e1900c59b80307b43b1483d8.tar.gz gcc-177cce463d56f7a0e1900c59b80307b43b1483d8.tar.bz2 | |
c-opts.c (sanitize_cpp_opts): Make warn_long_long be set according to warn_c90_c99_compat.
gcc/c-family/
* c-opts.c (sanitize_cpp_opts): Make warn_long_long be set according
to warn_c90_c99_compat.
* c.opt (Wc90-c99-compat, Wdeclaration-after-statement): Initialize
to -1.
gcc/c/
* c-decl.c (warn_variable_length_array): Pass OPT_Wvla unconditionally
to pedwarn_c90.
* c-errors.c: Include "opts.h".
(pedwarn_c90): Rewrite to handle -Wno-c90-c99-compat better.
* c-parser.c (disable_extension_diagnostics): Handle negative value
of warn_c90_c99_compat, too.
(restore_extension_diagnostics): Likewise.
(c_parser_compound_statement_nostart): Pass
OPT_Wdeclaration_after_statement unconditionally to pedwarn_c90.
gcc/testsuite/
* gcc.dg/Wc90-c99-compat-4.c: Remove all dg-warnings.
* gcc.dg/Wc90-c99-compat-5.c: Remove all dg-errors.
* gcc.dg/Wc90-c99-compat-7.c: New test.
* gcc.dg/Wc90-c99-compat-8.c: New test.
* gcc.dg/Wdeclaration-after-statement-4.c: New test.
libcpp/
* charset.c (_cpp_valid_ucn): Warn only if -Wc90-c99-compat.
* lex.c (_cpp_lex_direct): Likewise.
* macro.c (replace_args): Likewise.
(parse_params): Likewise.
* include/cpplib.h (cpp_options): Change cpp_warn_c90_c99_compat
to char.
From-SVN: r214131
Diffstat (limited to 'gcc/c/c-parser.c')
| -rw-r--r-- | gcc/c/c-parser.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 5f23379..6afe3eb 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -1073,7 +1073,10 @@ disable_extension_diagnostics (void) | (warn_long_long << 4) | (warn_cxx_compat << 5) | (warn_overlength_strings << 6) - | (warn_c90_c99_compat << 7)); + /* warn_c90_c99_compat has three states: -1/0/1, so we must + play tricks to properly restore it. */ + | ((warn_c90_c99_compat == 1) << 7) + | ((warn_c90_c99_compat == -1) << 8)); cpp_opts->cpp_pedantic = pedantic = 0; warn_pointer_arith = 0; cpp_opts->cpp_warn_traditional = warn_traditional = 0; @@ -1098,7 +1101,8 @@ restore_extension_diagnostics (int flags) cpp_opts->cpp_warn_long_long = warn_long_long = (flags >> 4) & 1; warn_cxx_compat = (flags >> 5) & 1; warn_overlength_strings = (flags >> 6) & 1; - warn_c90_c99_compat = (flags >> 7) & 1; + /* See above for why is this needed. */ + warn_c90_c99_compat = (flags >> 7) & 1 ? 1 : ((flags >> 8) & 1 ? -1 : 0); } /* Possibly kinds of declarator to parse. */ @@ -4570,9 +4574,7 @@ c_parser_compound_statement_nostart (c_parser *parser) c_parser_declaration_or_fndef (parser, true, true, true, true, true, NULL, vNULL); if (last_stmt) - pedwarn_c90 (loc, (pedantic && !flag_isoc99) - ? OPT_Wpedantic - : OPT_Wdeclaration_after_statement, + pedwarn_c90 (loc, OPT_Wdeclaration_after_statement, "ISO C90 forbids mixed declarations and code"); last_stmt = false; } @@ -4600,9 +4602,7 @@ c_parser_compound_statement_nostart (c_parser *parser) disable this diagnostic. */ restore_extension_diagnostics (ext); if (last_stmt) - pedwarn_c90 (loc, (pedantic && !flag_isoc99) - ? OPT_Wpedantic - : OPT_Wdeclaration_after_statement, + pedwarn_c90 (loc, OPT_Wdeclaration_after_statement, "ISO C90 forbids mixed declarations and code"); last_stmt = false; } |