* init.c (perform_member_init): Check CLASS_TYPE_P.

From-SVN: r158822

* init.c (perform_member_init): Check CLASS_TYPE_P.
From-SVN: r158822
012e6a1e · Jason Merrill · Jason Merrill · a8ae1977 · 012e6a1e · 012e6a1e
Commit 012e6a1e authored Apr 27, 2010 by Jason Merrill Committed by Jason Merrill Apr 27, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/init.c
+5 -3

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2010-04-27  Jason Merrill  <jason@redhat.com>
+
+	* init.c (perform_member_init): Check CLASS_TYPE_P.
+
 2010-04-27  Fabien Chêne  <fabien.chene@gmail.com>

 	PR c++/29043

--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -518,9 +518,11 @@ perform_member_init (tree member, tree init)
 		       member, type);

 	  core_type = strip_array_types (type);
-	  if (CLASSTYPE_READONLY_FIELDS_NEED_INIT (core_type)
-	      || CLASSTYPE_REF_FIELDS_NEED_INIT (core_type))
-	    diagnose_uninitialized_cst_or_ref_member (core_type, /*using_new=*/false);
+	  if (CLASS_TYPE_P (core_type)
+	      && (CLASSTYPE_READONLY_FIELDS_NEED_INIT (core_type)
+		  || CLASSTYPE_REF_FIELDS_NEED_INIT (core_type)))
+	    diagnose_uninitialized_cst_or_ref_member (core_type,
+						      /*using_new=*/false);
 	}
      else if (TREE_CODE (init) == TREE_LIST)
 	/* There was an explicit member initialization.  Do some work