diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-12 16:07:38 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-12 16:07:38 +0000 |
| commit | b67dd653b2ef612bc28d07f537ccbae7ca9a1387 (patch) | |
| tree | 47a081bcd8d674465343a3cedc9e1de828548dc5 | |
| parent | 69c638bc39f42a19622b9fa3b5edc0a10aad9bb2 (diff) | |
| download | ppe42-gcc-b67dd653b2ef612bc28d07f537ccbae7ca9a1387.tar.gz ppe42-gcc-b67dd653b2ef612bc28d07f537ccbae7ca9a1387.zip | |
cp:
PR c++/20172
* pt.c (tsubst_template_parms): Check for invalid non-type
parameters.
testsuite:
PR c++/20172
* g++.dg/template/nontype12.C : New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101928 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/nontype12.C | 35 |
4 files changed, 50 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 75da1b34e5c..80a28022417 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2005-07-12 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + Nathan Sidwell <nathan@codesourcery.com> + + PR c++/20172 + * pt.c (tsubst_template_parms): Check for invalid non-type + parameters. + 2005-07-09 Andrew Pinski <pinskia@physics.uc.edu> * cp-lang.c (shadowed_var_for_decl, decl_shadowed_for_var_lookup, diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0fcb5e85a54..bbf3bf9bb34 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5987,6 +5987,9 @@ tsubst_template_parms (tree parms, tree args, tsubst_flags_t complain) tree parm_decl = TREE_VALUE (tuple); parm_decl = tsubst (parm_decl, args, complain, NULL_TREE); + if (TREE_CODE (parm_decl) == PARM_DECL + && invalid_nontype_parm_type_p (TREE_TYPE (parm_decl), complain)) + parm_decl = error_mark_node; default_value = tsubst_template_arg (default_value, args, complain, NULL_TREE); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2a0a5f8eb00..6502977bb18 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-07-12 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR c++/20172 + * g++.dg/template/nontype12.C : New test. + 2005-07-12 Zdenek Dvorak <dvorakz@suse.cz> * gcc.dg/tree-ssa/loop-10.c: New test. diff --git a/gcc/testsuite/g++.dg/template/nontype12.C b/gcc/testsuite/g++.dg/template/nontype12.C new file mode 100644 index 00000000000..0200e870b95 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/nontype12.C @@ -0,0 +1,35 @@ +// PR c++/20172 +// Origin: Volker Reichelt <reichelt@igpm.rwth-aachen.de> + +template<typename T> struct A +{ + template<T> int foo(); // { dg-error "double" } + template<template<T> class> int bar(); // { dg-error "double" } + template<T> struct X; // { dg-error "double" } +}; + +A<char> a1; +A<double> a2; // { dg-error "instantiated" } + +template<typename T> struct B +{ + template<double> int foo(); // { dg-error "double" } + template<template<double> class> int bar(); // { dg-error "double" } + template<double> struct X; // { dg-error "double" } +}; + +template<void> int foo(); // { dg-error "void" } +template<template<void> class> int bar(); // { dg-error "void" } +template<void> struct X; // { dg-error "void" } + +template<typename T> struct C +{ + template<T> int foo(); // { dg-error "double" } +}; + +template<typename T> int baz(T) { C<T> c; } // { dg-error "instantiated" } + +void foobar() +{ + baz(1.2); // { dg-error "instantiated" } +} |
