diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-04-08 18:09:35 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-04-08 18:09:35 +0000 |
| commit | 0c3f68a025fc9d41a615854c21c6f2363739c066 (patch) | |
| tree | 92fdcb27459923ecf6448b366a65496e139d9866 | |
| parent | 8ddb5a296eea999c6376f43a643b2baf79cf886a (diff) | |
| download | gcc-0c3f68a025fc9d41a615854c21c6f2363739c066.zip gcc-0c3f68a025fc9d41a615854c21c6f2363739c066.tar.gz gcc-0c3f68a025fc9d41a615854c21c6f2363739c066.tar.bz2 | |
re PR c++/56871 ([c++11] Specialization of constexpr Templated Function)
/cp
2013-04-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56871
* decl.c (validate_constexpr_redeclaration): Allow an explicit
specialization to be different wrt the constexpr specifier.
/testsuite
2013-04-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56871
* g++.dg/cpp0x/constexpr-specialization.C: New.
From-SVN: r197597
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 19 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-specialization.C | 12 |
4 files changed, 37 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1af1fd7..8b9bf35 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-04-08 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/56871 + * decl.c (validate_constexpr_redeclaration): Allow an explicit + specialization to be different wrt the constexpr specifier. + 2013-04-06 Jason Merrill <jason@redhat.com> * parser.c (cp_parser_std_attribute): Treat [[noreturn]] like GNU diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 70137f4..01804d2 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1196,12 +1196,21 @@ validate_constexpr_redeclaration (tree old_decl, tree new_decl) if (DECL_DECLARED_CONSTEXPR_P (old_decl) == DECL_DECLARED_CONSTEXPR_P (new_decl)) return true; - if (TREE_CODE (old_decl) == FUNCTION_DECL && DECL_BUILT_IN (old_decl)) + if (TREE_CODE (old_decl) == FUNCTION_DECL) { - /* Hide a built-in declaration. */ - DECL_DECLARED_CONSTEXPR_P (old_decl) - = DECL_DECLARED_CONSTEXPR_P (new_decl); - return true; + if (DECL_BUILT_IN (old_decl)) + { + /* Hide a built-in declaration. */ + DECL_DECLARED_CONSTEXPR_P (old_decl) + = DECL_DECLARED_CONSTEXPR_P (new_decl); + return true; + } + /* 7.1.5 [dcl.constexpr] + Note: An explicit specialization can differ from the template + declaration with respect to the constexpr specifier. */ + if (! DECL_TEMPLATE_SPECIALIZATION (old_decl) + && DECL_TEMPLATE_SPECIALIZATION (new_decl)) + return true; } error ("redeclaration %qD differs in %<constexpr%>", new_decl); error ("from previous declaration %q+D", old_decl); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dcf0d58..9fdbdfc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-04-08 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/56871 + * g++.dg/cpp0x/constexpr-specialization.C: New. + 2013-04-08 Jakub Jelinek <jakub@redhat.com> * gcc.c-torture/execute/pr56837.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-specialization.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-specialization.C new file mode 100644 index 0000000..8003ed9 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-specialization.C @@ -0,0 +1,12 @@ +// PR c++/56871 +// { dg-options "-std=c++11" } + +template<typename T> constexpr int foo(T); +template<> int foo(int); +template<> int foo(int); // { dg-error "previous" } +template<> constexpr int foo(int); // { dg-error "redeclaration" } + +template<typename T> int bar(T); +template<> constexpr int bar(int); +template<> constexpr int bar(int); // { dg-error "previous" } +template<> int bar(int); // { dg-error "redeclaration" } |