From: Jason Merrill <jason@redhat.com>
Date: Fri, 8 Jul 2011 17:37:29 +0000 (-0400)
Subject: typeck.c (cp_apply_type_quals_to_decl): Don't check COMPLETE_TYPE_P either.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=859f6cb4c614aa98677de15733634ea58d03ed87;p=gcc.git

typeck.c (cp_apply_type_quals_to_decl): Don't check COMPLETE_TYPE_P either.

	* typeck.c (cp_apply_type_quals_to_decl): Don't check
	COMPLETE_TYPE_P either.

From-SVN: r176052
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 469e6cb1a14..092e5c01043 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-08  Jason Merrill  <jason@redhat.com>
 
+	* typeck.c (cp_apply_type_quals_to_decl): Don't check
+	COMPLETE_TYPE_P either.
+
 	PR c++/49673
 	* typeck.c (cp_apply_type_quals_to_decl): Don't check
 	TYPE_NEEDS_CONSTRUCTING.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index f0d68c3dca5..5febff5cba9 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -8130,12 +8130,10 @@ cp_apply_type_quals_to_decl (int type_quals, tree decl)
   /* We used to check TYPE_NEEDS_CONSTRUCTING here, but now a constexpr
      constructor can produce constant init, so rely on cp_finish_decl to
      clear TREE_READONLY if the variable has non-constant init.  */
-  if (/* If the type isn't complete, we don't know yet if it will need
-	 constructing.  */
-      !COMPLETE_TYPE_P (type)
-      /* If the type has a mutable component, that component might be
-	 modified.  */
-      || TYPE_HAS_MUTABLE_P (type))
+
+  /* If the type has a mutable component, that component might be
+     modified.  */
+  if (TYPE_HAS_MUTABLE_P (type))
     type_quals &= ~TYPE_QUAL_CONST;
 
   c_apply_type_quals_to_decl (type_quals, decl);