diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2008-10-03 16:29:07 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-10-03 16:29:07 +0000 |
| commit | 4d4e036d312737ad346b092a4e9289dae2067188 (patch) | |
| tree | 84895d6f0fd1e1cc6c70307db98155f13c421fae | |
| parent | 2f07423c8c234c5a5739b1c26d37e4d52d539375 (diff) | |
| download | gcc-4d4e036d312737ad346b092a4e9289dae2067188.zip gcc-4d4e036d312737ad346b092a4e9289dae2067188.tar.gz gcc-4d4e036d312737ad346b092a4e9289dae2067188.tar.bz2 | |
re PR c++/37719 (incorrect type on warning of mismatched exception specification with templates)
/cp
2008-10-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/37719
* error.c (dump_function_decl): Save the exceptions in case of
error about incompatible specifications in a specialization.
/testsuite
2008-10-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/37719
* g++.dg/template/error36.C: New.
From-SVN: r140855
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/error.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/error36.C | 9 |
4 files changed, 26 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ea319f3..acb766f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-10-03 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/37719 + * error.c (dump_function_decl): Save the exceptions in case of + error about incompatible specifications in a specialization. + 2008-10-01 Andrew Pinski <andrew_pinski@playstation.sony.com> * tree.c (lvalue_p_1): COMPOUND_LITERAL_EXPR is also an lvalue. diff --git a/gcc/cp/error.c b/gcc/cp/error.c index b8330c3..4064ad40 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -1084,11 +1084,16 @@ dump_function_decl (tree t, int flags) tree template_parms = NULL_TREE; int show_return = flags & TFF_RETURN_TYPE || flags & TFF_DECL_SPECIFIERS; int do_outer_scope = ! (flags & TFF_UNQUALIFIED_NAME); + tree exceptions; flags &= ~TFF_UNQUALIFIED_NAME; if (TREE_CODE (t) == TEMPLATE_DECL) t = DECL_TEMPLATE_RESULT (t); + /* Save the exceptions, in case t is a specialization and we are + emitting an error about incompatible specifications. */ + exceptions = TYPE_RAISES_EXCEPTIONS (TREE_TYPE (t)); + /* Pretty print template instantiations only. */ if (DECL_USE_TEMPLATE (t) && DECL_TEMPLATE_INFO (t)) { @@ -1153,7 +1158,7 @@ dump_function_decl (tree t, int flags) if (flags & TFF_EXCEPTION_SPECIFICATION) { pp_base (cxx_pp)->padding = pp_before; - dump_exception_spec (TYPE_RAISES_EXCEPTIONS (fntype), flags); + dump_exception_spec (exceptions, flags); } if (show_return) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7894386..f2c8bf2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-10-03 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/37719 + * g++.dg/template/error36.C: New. + 2008-10-02 Steven Bosscher <steven@gcc.gnu.org> PR fortran/37635 diff --git a/gcc/testsuite/g++.dg/template/error36.C b/gcc/testsuite/g++.dg/template/error36.C new file mode 100644 index 0000000..b16b976 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/error36.C @@ -0,0 +1,9 @@ +// PR c++/37719.C + +template <typename T> +class foo { + void bar() throw(int); // { dg-error "throw \\(int\\)" } +}; + +template <> +void foo<int>::bar() throw(float) {} // { dg-error "throw \\(float\\)" } |