re PR c++/48296 ([C++0x] constexpr member function cannot use the class type it belon...

	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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 99a06d1fbc5b7e86a05ccfdee0a66f01475c052c..1ffe70b3933bf8914aca1bd7b94e01f3cbaabd9f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
 2011-03-29  Jason Merrill  <jason@redhat.com>
 
+       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  <jason@redhat.com>

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index adae51f1989ccf0a6630be1f0fea8c83bc734ae1..24b8a31a44787c8ba3e08d0787f19fea71c4ea7b 100644 (file)
--- 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 895527c2c3e48156e64cb055c396eda198009996..16ccfaf5b69b43f77f3281b1136e492c8f82e5a1 100644 (file)
--- 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 da8c0163849f8fed2a49a5f4ae3ee986c79b6528..f1c3d9af3000120fa9d2090269eafc83db3a2d47 100644 (file)
--- 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 721427265e55064e02a57e8372417443f2ed2a82..5cb4f4e2cb63c3ed70dce39d8fbb4ad08801b128 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-29  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/cpp0x/constexpr-memfn1.C: New.
+
        * g++.dg/cpp0x/constexpr-diag1.C: Adjust error locations.
 
 2011-03-29  Janus Weil  <janus@gcc.gnu.org>

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C
new file mode 100644 (file)
index 0000000..4646f82
--- /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" }
+};