From 0cec1c2da3ad278d0ab987883a19475b1546675f Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 2 Oct 2015 09:28:56 +0000 Subject: [PATCH] trans.c (Pragma_to_gnu): Replace linear search with call to find_opt and issue warnings if... * gcc-interface/trans.c (Pragma_to_gnu) : Replace linear search with call to find_opt and issue warnings if the -W switch is not appropriate. From-SVN: r228379 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/trans.c | 25 ++++++++++++++++--------- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/warn13.adb | 11 +++++++++++ 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/warn13.adb diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0e5d83abddf..a4b159ddd02 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2015-10-02 Eric Botcazou + + * gcc-interface/trans.c (Pragma_to_gnu) : Replace + linear search with call to find_opt and issue warnings if the -W + switch is not appropriate. + 2015-10-02 Eric Botcazou * gcc-interface/ada-tree.h (DECL_RESTRICTED_ALIASING_P): New flag. diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 1da381b9cc6..3252ea2732e 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -1442,21 +1442,28 @@ Pragma_to_gnu (Node_Id gnat_node) gcc_unreachable (); /* This is the same implementation as in the C family of compilers. */ + const unsigned int lang_mask = CL_Ada | CL_COMMON; if (Present (gnat_expr)) { tree gnu_expr = gnat_to_gnu (gnat_expr); - const char *opt_string = TREE_STRING_POINTER (gnu_expr); + const char *option_string = TREE_STRING_POINTER (gnu_expr); const int len = TREE_STRING_LENGTH (gnu_expr); - if (len < 3 || opt_string[0] != '-' || opt_string[1] != 'W') + if (len < 3 || option_string[0] != '-' || option_string[1] != 'W') break; - for (option_index = 0; - option_index < cl_options_count; - option_index++) - if (strcmp (cl_options[option_index].opt_text, opt_string) == 0) + option_index = find_opt (option_string + 1, lang_mask); + if (option_index == OPT_SPECIAL_unknown) + { + post_error ("?unknown -W switch", gnat_node); break; - if (option_index == cl_options_count) + } + else if (!(cl_options[option_index].flags & CL_WARNING)) + { + post_error ("?-W switch does not control warning", gnat_node); + break; + } + else if (!(cl_options[option_index].flags & lang_mask)) { - post_error ("unknown -W switch", gnat_node); + post_error ("?-W switch not valid for Ada", gnat_node); break; } } @@ -1465,7 +1472,7 @@ Pragma_to_gnu (Node_Id gnat_node) set_default_handlers (&handlers); control_warning_option (option_index, (int) kind, imply, location, - CL_Ada, &handlers, &global_options, + lang_mask, &handlers, &global_options, &global_options_set, global_dc); } break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ae4f5aa4efd..169c0c4e218 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-10-02 Eric Botcazou + + * gnat.dg/warn13.adb: New test. + 2015-10-02 Eric Botcazou * gnat.dg/vect15.ad[sb]: New test. diff --git a/gcc/testsuite/gnat.dg/warn13.adb b/gcc/testsuite/gnat.dg/warn13.adb new file mode 100644 index 00000000000..2a9c4e392cc --- /dev/null +++ b/gcc/testsuite/gnat.dg/warn13.adb @@ -0,0 +1,11 @@ +-- { dg-compile } + +procedure Warn13 is + + pragma Warnings ("-Wbogus"); -- { dg-warning "unknown" } + pragma Warnings ("-Werror"); -- { dg-warning "does not control warning" } + pragma Warnings ("-Wformat"); -- { dg-warning "switch not valid for Ada" } + +begin + null; +end; -- 2.30.2