diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-02-28 20:20:21 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-02-28 20:20:21 +0000 |
| commit | f1ee5eaf07345816fd6b1adf90e53ead9800076b (patch) | |
| tree | d59a91671b1191228fba3c380a6ed104d106f938 /gcc | |
| parent | c5b001b5f0d4e8355de686a4c84abae96efbbbcd (diff) | |
| download | gcc-f1ee5eaf07345816fd6b1adf90e53ead9800076b.zip gcc-f1ee5eaf07345816fd6b1adf90e53ead9800076b.tar.gz gcc-f1ee5eaf07345816fd6b1adf90e53ead9800076b.tar.bz2 | |
re PR c++/58610 ([c++11] ICE with constexpr of class with template constructor)
/cp
2014-02-28 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58610
* cp-tree.h (DECL_DELETED_FN): Use LANG_DECL_FN_CHECK.
* call.c (print_z_candidate): Remove STRIP_TEMPLATE use.
* lambda.c (maybe_add_lambda_conv_op): Likewise.
/testsuite
2014-02-28 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58610
* g++.dg/cpp0x/constexpr-ice11.C: New.
From-SVN: r208226
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/call.c | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/lambda.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-ice11.C | 9 |
6 files changed, 24 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eaec522..9a13f49 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-02-28 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58610 + * cp-tree.h (DECL_DELETED_FN): Use LANG_DECL_FN_CHECK. + * call.c (print_z_candidate): Remove STRIP_TEMPLATE use. + * lambda.c (maybe_add_lambda_conv_op): Likewise. + 2014-02-27 Paolo Carlini <paolo.carlini@oracle.com> PR c++/60253 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 53b97d9..b58c072 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3237,7 +3237,7 @@ print_z_candidate (location_t loc, const char *msgstr, inform (cloc, "%s%T <conversion>", msg, candidate->fn); else if (candidate->viable == -1) inform (cloc, "%s%#D <near match>", msg, candidate->fn); - else if (DECL_DELETED_FN (STRIP_TEMPLATE (candidate->fn))) + else if (DECL_DELETED_FN (candidate->fn)) inform (cloc, "%s%#D <deleted>", msg, candidate->fn); else inform (cloc, "%s%#D", msg, candidate->fn); diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 3db18f3..8ec7d6a 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3222,7 +3222,7 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter) /* Nonzero if DECL was declared with '= delete'. */ #define DECL_DELETED_FN(DECL) \ - (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (DECL))->u.base.threadprivate_or_deleted_p) + (LANG_DECL_FN_CHECK (DECL)->min.base.threadprivate_or_deleted_p) /* Nonzero if DECL was declared with '= default' (maybe implicitly). */ #define DECL_DEFAULTED_FN(DECL) \ diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 277dec6..0b8b46a 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -975,7 +975,7 @@ maybe_add_lambda_conv_op (tree type) the conversion op is used. */ if (varargs_function_p (callop)) { - DECL_DELETED_FN (STRIP_TEMPLATE (fn)) = 1; + DECL_DELETED_FN (fn) = 1; return; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c8a7fb4..3011092 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2014-02-28 Paolo Carlini <paolo.carlini@oracle.com> + PR c++/58610 + * g++.dg/cpp0x/constexpr-ice11.C: New. + +2014-02-28 Paolo Carlini <paolo.carlini@oracle.com> + PR c++/60314 * g++.dg/cpp1y/auto-fn24.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice11.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice11.C new file mode 100644 index 0000000..3e32bf6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice11.C @@ -0,0 +1,9 @@ +// PR c++/58610 +// { dg-do compile { target c++11 } } + +struct A +{ + template<typename> A(); +}; + +constexpr A a; // { dg-error "literal|matching" } |