From: Jason Merrill Date: Mon, 22 Sep 2014 16:31:09 +0000 (-0400) Subject: decl.c (poplevel): Don't warn about unused vars in template scope. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aed67566921b2153c5af392ad095e04602aa036f;p=gcc.git decl.c (poplevel): Don't warn about unused vars in template scope. * decl.c (poplevel): Don't warn about unused vars in template scope. * error.c (dump_decl): Handle variable templates. From-SVN: r215472 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 857f58d4264..3dc8c7c3a3b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-09-22 Jason Merrill + + * decl.c (poplevel): Don't warn about unused vars in template scope. + * error.c (dump_decl): Handle variable templates. + 2014-09-20 Jason Merrill PR c++/62017 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index fe5a4af17b5..12a9f43de2f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -624,6 +624,7 @@ poplevel (int keep, int reverse, int functionbody) /* Before we remove the declarations first check for unused variables. */ if ((warn_unused_variable || warn_unused_but_set_variable) + && current_binding_level->kind != sk_template_parms && !processing_template_decl) for (tree d = getdecls (); d; d = TREE_CHAIN (d)) { diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 86fd4056f8d..a03bfe12c16 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -1044,6 +1044,18 @@ dump_decl (cxx_pretty_printer *pp, tree t, int flags) case FIELD_DECL: case PARM_DECL: dump_simple_decl (pp, t, TREE_TYPE (t), flags); + + /* Handle variable template specializations. */ + if (TREE_CODE (t) == VAR_DECL + && DECL_LANG_SPECIFIC (t) + && DECL_TEMPLATE_INFO (t) + && PRIMARY_TEMPLATE_P (DECL_TI_TEMPLATE (t))) + { + pp_cxx_begin_template_argument_list (pp); + tree args = INNERMOST_TEMPLATE_ARGS (DECL_TI_ARGS (t)); + dump_template_argument_list (pp, args, flags); + pp_cxx_end_template_argument_list (pp); + } break; case RESULT_DECL: diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ12.C b/gcc/testsuite/g++.dg/cpp1y/var-templ12.C new file mode 100644 index 00000000000..49ea588cc5d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ12.C @@ -0,0 +1,10 @@ +// { dg-do compile { target c++14 } } +// { dg-options "-Wall" } + +template T x; +template <> int x = 0; + +int main() +{ + return x; +} diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ13.C b/gcc/testsuite/g++.dg/cpp1y/var-templ13.C new file mode 100644 index 00000000000..e398d22fddc --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ13.C @@ -0,0 +1,5 @@ +// { dg-do compile { target c++14 } } + +template T x; +template <> int x = 0; +template <> int x = 0; // { dg-error "x" }