From a90caaa2fde8b592910b232176e6f0f6188dcd0a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 29 Mar 2011 09:27:25 -0400 Subject: [PATCH] re PR c++/48296 ([C++0x] constexpr member function cannot use the class type it belongs as parameter type or return type) PR c++/48296 * decl.c (cp_finish_decl): Defer validation of constexpr member functions. * class.c (finalize_literal_type_property): Validate them here. * semantics.c (is_valid_constexpr_fn): Don't check completeness. From-SVN: r171661 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/class.c | 18 ++++++------------ gcc/cp/decl.c | 5 ++++- gcc/cp/semantics.c | 3 +-- gcc/testsuite/ChangeLog | 2 ++ gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C | 18 ++++++++++++++++++ 6 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 99a06d1fbc5..1ffe70b3933 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2011-03-29 Jason Merrill + PR c++/48296 + * decl.c (cp_finish_decl): Defer validation of constexpr member + functions. + * class.c (finalize_literal_type_property): Validate them here. + * semantics.c (is_valid_constexpr_fn): Don't check completeness. + * semantics.c (is_valid_constexpr_fn): Specify input location. 2011-03-28 Jason Merrill diff --git a/gcc/cp/class.c b/gcc/cp/class.c index adae51f1989..24b8a31a447 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4549,6 +4549,8 @@ type_requires_array_cookie (tree type) static void finalize_literal_type_property (tree t) { + tree fn; + if (cxx_dialect < cxx0x || TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t) /* FIXME These constraints seem unnecessary; remove from standard. @@ -4559,18 +4561,10 @@ finalize_literal_type_property (tree t) && !TYPE_HAS_CONSTEXPR_CTOR (t)) CLASSTYPE_LITERAL_P (t) = false; - if (!CLASSTYPE_LITERAL_P (t) && !CLASSTYPE_TEMPLATE_INSTANTIATION (t)) - { - tree fn; - for (fn = TYPE_METHODS (t); fn; fn = DECL_CHAIN (fn)) - if (DECL_DECLARED_CONSTEXPR_P (fn) - && DECL_NONSTATIC_MEMBER_FUNCTION_P (fn) - && !DECL_CONSTRUCTOR_P (fn)) - { - error ("enclosing class of %q+D is not a literal type", fn); - DECL_DECLARED_CONSTEXPR_P (fn) = false; - } - } + for (fn = TYPE_METHODS (t); fn; fn = DECL_CHAIN (fn)) + if (DECL_DECLARED_CONSTEXPR_P (fn) + && TREE_CODE (fn) != TEMPLATE_DECL) + validate_constexpr_fundecl (fn); } /* Check the validity of the bases and members declared in T. Add any diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 895527c2c3e..16ccfaf5b69 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5794,7 +5794,10 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, } } - if (TREE_CODE (decl) == FUNCTION_DECL) + if (TREE_CODE (decl) == FUNCTION_DECL + /* For members, defer until finalize_literal_type_property. */ + && (!DECL_CLASS_SCOPE_P (decl) + || !TYPE_BEING_DEFINED (DECL_CONTEXT (decl)))) validate_constexpr_fundecl (decl); else if (!ensure_literal_type_for_constexpr_object (decl)) diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index da8c0163849..f1c3d9af300 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -5354,8 +5354,7 @@ is_valid_constexpr_fn (tree fun, bool complain) } if (DECL_NONSTATIC_MEMBER_FUNCTION_P (fun) - && COMPLETE_TYPE_P (DECL_CONTEXT (fun)) - && !valid_type_in_constexpr_fundecl_p (DECL_CONTEXT (fun))) + && !CLASSTYPE_LITERAL_P (DECL_CONTEXT (fun))) { ret = false; if (complain) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 721427265e5..5cb4f4e2cb6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2011-03-29 Jason Merrill + * g++.dg/cpp0x/constexpr-memfn1.C: New. + * g++.dg/cpp0x/constexpr-diag1.C: Adjust error locations. 2011-03-29 Janus Weil diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C new file mode 100644 index 00000000000..4646f82b904 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C @@ -0,0 +1,18 @@ +// PR c++/48296 +// { dg-options -std=c++0x } + +struct X +{ + constexpr X() { } + constexpr X f(X x) { return x; } + constexpr X g(X x); +}; + +constexpr X X::g(X x) { return x; } + +struct Y +{ + Y() { } + constexpr Y f(Y y); // { dg-error "constexpr" } + static constexpr Y g(Y y); // { dg-error "constexpr" } +}; -- 2.30.2