From 892e7b037a7ac749cd787f2a91bd9041cd221202 Mon Sep 17 00:00:00 2001
From: fabien <fabien@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 6 Jun 2010 09:35:45 +0000
Subject: [PATCH] Fix PR c++/44086

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160337 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                       |  7 +++++++
 gcc/cp/class.c                         | 16 ++++++++--------
 gcc/testsuite/ChangeLog                |  6 ++++++
 gcc/testsuite/g++.dg/cpp0x/decltype4.C |  1 +
 gcc/testsuite/g++.dg/init/pr44086.C    | 15 +++++++++++++++
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/init/pr44086.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d75030e8c06b..6572ac06379f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-05  Fabien Chêne  <fabien@gcc.gnu.org>
+	
+	PR c++/44086
+	* class.c (check_field_decls): Move the call to
+	check_bitfield_decl before trying to set the
+	CLASSTYPE_READONLY_FIELDS_NEED_INIT flag.
+
 2010-06-05  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* typeck.c: Update include path for moved files.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 2ee779299fe3..c6da4cd28bba 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -3092,6 +3092,14 @@ check_field_decls (tree t, tree *access_decls,
       if (! zero_init_p (type))
 	CLASSTYPE_NON_ZERO_INIT_P (t) = 1;
 
+      /* We set DECL_C_BIT_FIELD in grokbitfield.
+	 If the type and width are valid, we'll also set DECL_BIT_FIELD.  */
+      if (! DECL_C_BIT_FIELD (x) || ! check_bitfield_decl (x))
+	check_field_decl (x, t,
+			  cant_have_const_ctor_p,
+			  no_const_asn_ref_p,
+			  &any_default_members);
+
       /* If any field is const, the structure type is pseudo-const.  */
       if (CP_TYPE_CONST_P (type))
 	{
@@ -3120,14 +3128,6 @@ check_field_decls (tree t, tree *access_decls,
       if (constructor_name_p (DECL_NAME (x), t)
 	  && TYPE_HAS_USER_CONSTRUCTOR (t))
 	permerror (input_location, "field %q+#D with same name as class", x);
-
-      /* We set DECL_C_BIT_FIELD in grokbitfield.
-	 If the type and width are valid, we'll also set DECL_BIT_FIELD.  */
-      if (! DECL_C_BIT_FIELD (x) || ! check_bitfield_decl (x))
-	check_field_decl (x, t,
-			  cant_have_const_ctor_p,
-			  no_const_asn_ref_p,
-			  &any_default_members);
     }
 
   /* Effective C++ rule 11: if a class has dynamic memory held by pointers,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e84da1929d9e..4400b9a502a1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-05  Fabien Chêne  <fabien@gcc.gnu.org>
+
+	PR c++/44086
+	* g++.dg/init/pr44086.C: New.
+	* g++.dg/cpp0x/decltype4.C: Adjust.
+
 2010-06-05  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/43945
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype4.C b/gcc/testsuite/g++.dg/cpp0x/decltype4.C
index 23a34344e171..32fbc2b2ec20 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype4.C
@@ -62,6 +62,7 @@ void wibble() {
 }
 
 struct B {
+  B () : bit(), cbit() {} 
   int bit : 2;
   const int cbit : 3;
 
diff --git a/gcc/testsuite/g++.dg/init/pr44086.C b/gcc/testsuite/g++.dg/init/pr44086.C
new file mode 100644
index 000000000000..e3304f4a27b3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/pr44086.C
@@ -0,0 +1,15 @@
+// PR c++/44086
+// { dg-do compile }
+
+struct A
+{
+    int const i : 2; // { dg-message "should be initialized" }
+};
+
+void f()
+{
+    A a;    // { dg-error "uninitialized const" }
+    new A;  // { dg-error "uninitialized const" }
+    A();
+    new A();
+}
-- 
2.47.2