From 50d50fc7eed9ef1ef9a941be3a73c3ecc3eed5b0 Mon Sep 17 00:00:00 2001 From: Seongbae Park Date: Mon, 12 Mar 2007 18:31:39 +0000 Subject: [PATCH] invoke.texi (Wvla): New warning. ChangeLog: 2007-03-12 Seongbae Park * gcc/doc/invoke.texi (Wvla): New warning. gcc/ChangeLog: 2007-03-12 Seongbae Park * c-decl.c (warn_variable_length_array): New function. Refactored from grokdeclarator to handle warn_vla and handle unnamed array case. (grokdeclarator): Refactored VLA warning case. * c.opt (Wvla): New flag. gcc/cp/ChangeLog: 2007-03-12 Seongbae Park * decl.c (compute_array_index_type): New warning flag warn_vla. gcc/testsuite/ChangeLog: 2007-03-12 Seongbae Park * gcc.dg/wvla-1.c: New test * gcc.dg/wvla-2.c: New test * gcc.dg/wvla-3.c: New test * gcc.dg/wvla-4.c: New test * gcc.dg/wvla-5.c: New test * gcc.dg/wvla-6.c: New test * gcc.dg/wvla-7.c: New test * g++.dg/warn/Wvla-1.C: New test * g++.dg/warn/Wvla-2.C: New test * g++.dg/warn/Wvla-3.C: New test From-SVN: r122851 --- ChangeLog | 4 +++ gcc/ChangeLog | 8 +++++ gcc/c-decl.c | 67 +++++++++++++++++++++++++++++++------- gcc/c.opt | 4 +++ gcc/cp/ChangeLog | 4 +++ gcc/cp/decl.c | 15 +++++++-- gcc/doc/invoke.texi | 10 +++++- gcc/testsuite/ChangeLog | 13 ++++++++ gcc/testsuite/g++.dg/warn/Wvla-1.C | 7 ++++ gcc/testsuite/g++.dg/warn/Wvla-2.C | 7 ++++ gcc/testsuite/g++.dg/warn/Wvla-3.C | 7 ++++ gcc/testsuite/gcc.dg/wvla-1.c | 5 +++ gcc/testsuite/gcc.dg/wvla-2.c | 5 +++ gcc/testsuite/gcc.dg/wvla-3.c | 5 +++ gcc/testsuite/gcc.dg/wvla-4.c | 5 +++ gcc/testsuite/gcc.dg/wvla-5.c | 5 +++ gcc/testsuite/gcc.dg/wvla-6.c | 5 +++ gcc/testsuite/gcc.dg/wvla-7.c | 5 +++ 18 files changed, 166 insertions(+), 15 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Wvla-1.C create mode 100644 gcc/testsuite/g++.dg/warn/Wvla-2.C create mode 100644 gcc/testsuite/g++.dg/warn/Wvla-3.C create mode 100644 gcc/testsuite/gcc.dg/wvla-1.c create mode 100644 gcc/testsuite/gcc.dg/wvla-2.c create mode 100644 gcc/testsuite/gcc.dg/wvla-3.c create mode 100644 gcc/testsuite/gcc.dg/wvla-4.c create mode 100644 gcc/testsuite/gcc.dg/wvla-5.c create mode 100644 gcc/testsuite/gcc.dg/wvla-6.c create mode 100644 gcc/testsuite/gcc.dg/wvla-7.c diff --git a/ChangeLog b/ChangeLog index 6d0fbb2ad8d..1d1035fa6e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-03-12 Seongbae Park + + * gcc/doc/invoke.texi (Wvla): New warning. + 2007-03-07 Andreas Schwab * configure: Regenerate. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ce27464f37..624f6517543 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2007-03-12 Seongbae Park + + * c-decl.c (warn_variable_length_array): New function. + Refactored from grokdeclarator to handle warn_vla + and handle unnamed array case. + (grokdeclarator): Refactored VLA warning case. + * c.opt (Wvla): New flag. + 2007-03-12 Richard Henderson * config/alpha/alpha.c (alpha_elf_section_type_flags): New. diff --git a/gcc/c-decl.c b/gcc/c-decl.c index fd5b065c193..eaef0a506b8 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -3891,6 +3891,61 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name) } + +/* Print warning about variable length array if necessary. */ + +static void +warn_variable_length_array (const char *name, tree size) +{ + int ped = !flag_isoc99 && pedantic && warn_vla != 0; + int const_size = TREE_CONSTANT (size); + + if (ped) + { + if (const_size) + { + if (name) + pedwarn ("ISO C90 forbids array %qs whose size " + "can%'t be evaluated", + name); + else + pedwarn ("ISO C90 forbids array whose size " + "can%'t be evaluated"); + } + else + { + if (name) + pedwarn ("ISO C90 forbids variable length array %qs", + name); + else + pedwarn ("ISO C90 forbids variable length array"); + } + } + else if (warn_vla > 0) + { + if (const_size) + { + if (name) + warning (OPT_Wvla, + "the size of array %qs can" + "%'t be evaluated", name); + else + warning (OPT_Wvla, + "the size of array can %'t be evaluated"); + } + else + { + if (name) + warning (OPT_Wvla, + "variable length array %qs is used", + name); + else + warning (OPT_Wvla, + "variable length array is used"); + } + } +} + /* Given declspecs and a declarator, determine the name and type of the object declared and construct a ..._DECL node for it. @@ -4289,17 +4344,7 @@ grokdeclarator (const struct c_declarator *declarator, nonconstant even if it is (eg) a const variable with known value. */ size_varies = 1; - - if (!flag_isoc99 && pedantic) - { - if (TREE_CONSTANT (size)) - pedwarn ("ISO C90 forbids array %qs whose size " - "can%'t be evaluated", - name); - else - pedwarn ("ISO C90 forbids variable-size array %qs", - name); - } + warn_variable_length_array (orig_name, size); } if (integer_zerop (size)) diff --git a/gcc/c.opt b/gcc/c.opt index 3fb36867aae..928e8b2c59a 100644 --- a/gcc/c.opt +++ b/gcc/c.opt @@ -450,6 +450,10 @@ Wvariadic-macros C ObjC C++ ObjC++ Warning Do not warn about using variadic macros when -pedantic +Wvla +C ObjC C++ ObjC++ Var(warn_vla) Init(-1) Warning +Warn if a variable length array is used + Wwrite-strings C ObjC C++ ObjC++ Var(warn_write_strings) Warning In C++, nonzero means warn about deprecated conversion from string literals to `char *'. In C, similar warning, except that the conversion is of course not deprecated by the ISO C standard. diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ccbb842d2fe..752d86fa4ef 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2007-03-12 Seongbae Park + + * decl.c (compute_array_index_type): New warning flag warn_vla. + 2007-03-12 Mark Mitchell PR c++/30108 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 318085a02b4..14d20cec227 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6632,12 +6632,21 @@ compute_array_index_type (tree name, tree size) error ("size of array is not an integral constant-expression"); size = integer_one_node; } - else if (pedantic) + else if (pedantic && warn_vla != 0) { if (name) - pedwarn ("ISO C++ forbids variable-size array %qD", name); + pedwarn ("ISO C++ forbids variable length array %qD", name); else - pedwarn ("ISO C++ forbids variable-size array"); + pedwarn ("ISO C++ forbids variable length array"); + } + else if (warn_vla > 0) + { + if (name) + warning (OPT_Wvla, + "variable length array %qD is used", name); + else + warning (OPT_Wvla, + "variable length array is used"); } if (processing_template_decl && !TREE_CONSTANT (size)) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 7bb9f38d038..dc5bc513d44 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -254,7 +254,8 @@ Objective-C and Objective-C++ Dialects}. -Wsystem-headers -Wtrigraphs -Wundef -Wuninitialized @gol -Wunknown-pragmas -Wno-pragmas -Wunreachable-code @gol -Wunused -Wunused-function -Wunused-label -Wunused-parameter @gol --Wunused-value -Wunused-variable -Wvariadic-macros @gol +-Wunused-value -Wunused-variable @gol +-Wvariadic-macros -Wvla @gol -Wvolatile-register-var -Wwrite-strings} @item C-only Warning Options @@ -3733,6 +3734,13 @@ Warn if variadic macros are used in pedantic ISO C90 mode, or the GNU alternate syntax when in pedantic ISO C99 mode. This is default. To inhibit the warning messages, use @option{-Wno-variadic-macros}. +@item -Wvla +@opindex Wvla +@opindex Wno-vla +Warn if variable length array is used in the code. +@option{-Wno-vla} will prevent the @option{-pedantic} warning of +the variable length array. + @item -Wvolatile-register-var @opindex Wvolatile-register-var @opindex Wno-volatile-register-var diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9d0a8df6333..3925c554a42 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2007-03-12 Seongbae Park + + * gcc.dg/wvla-1.c: New test + * gcc.dg/wvla-2.c: New test + * gcc.dg/wvla-3.c: New test + * gcc.dg/wvla-4.c: New test + * gcc.dg/wvla-5.c: New test + * gcc.dg/wvla-6.c: New test + * gcc.dg/wvla-7.c: New test + * g++.dg/warn/Wvla-1.C: New test + * g++.dg/warn/Wvla-2.C: New test + * g++.dg/warn/Wvla-3.C: New test + 2007-03-12 Mark Mitchell PR c++/30108 diff --git a/gcc/testsuite/g++.dg/warn/Wvla-1.C b/gcc/testsuite/g++.dg/warn/Wvla-1.C new file mode 100644 index 00000000000..ca3669aec99 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wvla-1.C @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-Wvla" } */ + +void func (int i) +{ + int array[i]; /* { dg-warning "variable length array 'array' is used" } */ +} diff --git a/gcc/testsuite/g++.dg/warn/Wvla-2.C b/gcc/testsuite/g++.dg/warn/Wvla-2.C new file mode 100644 index 00000000000..c611f07aab4 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wvla-2.C @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-pedantic-errors -Wvla" } */ + +void func (int i) +{ + int array[i]; /* { dg-error "error: ISO C.* forbids variable.* array 'array'" } */ +} diff --git a/gcc/testsuite/g++.dg/warn/Wvla-3.C b/gcc/testsuite/g++.dg/warn/Wvla-3.C new file mode 100644 index 00000000000..259c576b29f --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wvla-3.C @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-pedantic-errors -Wno-vla" } */ + +void func (int i) +{ + int array[i]; +} diff --git a/gcc/testsuite/gcc.dg/wvla-1.c b/gcc/testsuite/gcc.dg/wvla-1.c new file mode 100644 index 00000000000..c8f21078be9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/wvla-1.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-std=c89 -Wvla" } */ + +extern void +func (int i, int array[i]); /* { dg-warning "variable length array 'array' is used" } */ diff --git a/gcc/testsuite/gcc.dg/wvla-2.c b/gcc/testsuite/gcc.dg/wvla-2.c new file mode 100644 index 00000000000..d811a112f07 --- /dev/null +++ b/gcc/testsuite/gcc.dg/wvla-2.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-std=c99 -Wvla" } */ + +extern void +func (int i, int array[i]); /* { dg-warning "variable length array 'array' is used" } */ diff --git a/gcc/testsuite/gcc.dg/wvla-3.c b/gcc/testsuite/gcc.dg/wvla-3.c new file mode 100644 index 00000000000..3d5d3aa5434 --- /dev/null +++ b/gcc/testsuite/gcc.dg/wvla-3.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-pedantic-errors -std=c89 -Wvla" } */ + +extern void +func (int i, int array[i]); /* { dg-error "error: ISO C90 forbids variable.* array 'array'" } */ diff --git a/gcc/testsuite/gcc.dg/wvla-4.c b/gcc/testsuite/gcc.dg/wvla-4.c new file mode 100644 index 00000000000..8c15292edac --- /dev/null +++ b/gcc/testsuite/gcc.dg/wvla-4.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-pedantic-errors -std=c99 -Wvla" } */ + +extern void +func (int i, int array[i]); /* { dg-warning "variable length array 'array' is used" } */ diff --git a/gcc/testsuite/gcc.dg/wvla-5.c b/gcc/testsuite/gcc.dg/wvla-5.c new file mode 100644 index 00000000000..919b8dc201b --- /dev/null +++ b/gcc/testsuite/gcc.dg/wvla-5.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-pedantic-errors -std=c89 -Wno-vla" } */ + +extern void +func (int i, int array[i]); diff --git a/gcc/testsuite/gcc.dg/wvla-6.c b/gcc/testsuite/gcc.dg/wvla-6.c new file mode 100644 index 00000000000..f21435b02a8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/wvla-6.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-std=c89 -Wvla" } */ + +extern void +func (int i, int [i]); /* { dg-warning "variable length array is used" } */ diff --git a/gcc/testsuite/gcc.dg/wvla-7.c b/gcc/testsuite/gcc.dg/wvla-7.c new file mode 100644 index 00000000000..bc113bfb05d --- /dev/null +++ b/gcc/testsuite/gcc.dg/wvla-7.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-pedantic-errors -std=c89 -Wvla" } */ + +extern void +func (int i, int [i]); /* { dg-error "error: ISO C90 forbids variable" } */ -- 2.11.4.GIT