PR c++/25811

[pf3gnuchains/gcc-fork.git] / gcc / cp / init.c

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index e45d2b8..cb56d9c 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -54,7 +54,7 @@ static tree dfs_initialize_vtbl_ptrs (tree, void *);
 static tree build_dtor_call (tree, special_function_kind, int);
 static tree build_field_list (tree, tree, int *);
 static tree build_vtbl_address (tree);
-static int diagnose_uninitialized_cst_or_ref_member_1 (tree, tree, bool, bool);
+static void diagnose_uninitialized_cst_or_ref_member_1 (tree, tree, bool);
 
 /* We are about to generate some complex initialization code.
    Conceptually, it is all a single expression.  However, we may want
@@ -1772,18 +1772,13 @@ build_raw_new_expr (VEC(tree,gc) *placement, tree type, tree nelts,
 
 /* Diagnose uninitialized const members or reference members of type
    TYPE. USING_NEW is used to disambiguate the diagnostic between a
-   new expression without a new-initializer and a declaration. Returns
-   the error count. */
+   new expression without a new-initializer and a declaration */
 
-static int
+static void
 diagnose_uninitialized_cst_or_ref_member_1 (tree type, tree origin,
-                                           bool using_new, bool complain)
+                                           bool using_new)
 {
   tree field;
-  int error_count = 0;
-
-  if (type_has_user_provided_constructor (type))
-    return 0;
 
   for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
     {
@@ -1796,46 +1791,36 @@ diagnose_uninitialized_cst_or_ref_member_1 (tree type, tree origin,
 
       if (TREE_CODE (field_type) == REFERENCE_TYPE)
        {
-         ++ error_count;
-         if (complain)
-           {
-             if (using_new)
-               error ("uninitialized reference member in %q#T "
-                      "using %<new%> without new-initializer", origin);
-             else
-               error ("uninitialized reference member in %q#T", origin);
-             inform (DECL_SOURCE_LOCATION (field),
-                     "%qD should be initialized", field);
-           }
+         if (using_new)
+           error ("uninitialized reference member in %q#T using %<new%>",
+                  origin);
+         else
+           error ("uninitialized reference member in %q#T", origin);
+         inform (DECL_SOURCE_LOCATION (field),
+                 "%qD should be initialized", field);
        }
 
       if (CP_TYPE_CONST_P (field_type))
        {
-         ++ error_count;
-         if (complain)
-           {
-             if (using_new)
-               error ("uninitialized const member in %q#T "
-                      "using %<new%> without new-initializer", origin);
-             else
-               error ("uninitialized const member in %q#T", origin);
-             inform (DECL_SOURCE_LOCATION (field),
-                     "%qD should be initialized", field);
-           }
+         if (using_new)
+           error ("uninitialized const member in %q#T using %<new%>",
+                  origin);
+         else
+           error ("uninitialized const member in %q#T", origin);
+         inform (DECL_SOURCE_LOCATION (field),
+                 "%qD should be initialized", field);
        }
 
       if (CLASS_TYPE_P (field_type))
-       error_count
-         += diagnose_uninitialized_cst_or_ref_member_1 (field_type, origin,
-                                                        using_new, complain);
+       diagnose_uninitialized_cst_or_ref_member_1 (field_type,
+                                                   origin, using_new);
     }
-  return error_count;
 }
 
-int
-diagnose_uninitialized_cst_or_ref_member (tree type, bool using_new, bool complain)
+void
+diagnose_uninitialized_cst_or_ref_member (tree type, bool using_new)
 {
-  return diagnose_uninitialized_cst_or_ref_member_1 (type, type, using_new, complain);
+  diagnose_uninitialized_cst_or_ref_member_1 (type, type, using_new);
 }
 
 /* Generate code for a new-expression, including calling the "operator
@@ -1924,13 +1909,13 @@ build_new_1 (VEC(tree,gc) **placement, tree type, tree nelts,
 
   is_initialized = (TYPE_NEEDS_CONSTRUCTING (elt_type) || *init != NULL);
 
-  if (*init == NULL)
+  if (*init == NULL && !type_has_user_provided_constructor (elt_type))
     {
-      bool maybe_uninitialized_error = false;
+      bool uninitialized_error = false;
       /* A program that calls for default-initialization [...] of an
         entity of reference type is ill-formed. */
       if (CLASSTYPE_REF_FIELDS_NEED_INIT (elt_type))
-       maybe_uninitialized_error = true;
+       uninitialized_error = true;
 
       /* A new-expression that creates an object of type T initializes
         that object as follows:
@@ -1945,13 +1930,15 @@ build_new_1 (VEC(tree,gc) **placement, tree type, tree nelts,
           const-qualified type, the program is ill-formed; */
 
       if (CLASSTYPE_READONLY_FIELDS_NEED_INIT (elt_type))
-       maybe_uninitialized_error = true;
+       uninitialized_error = true;
 
-      if (maybe_uninitialized_error
-         && diagnose_uninitialized_cst_or_ref_member (elt_type,
-                                                      /*using_new=*/true,
-                                                      complain & tf_error))
-       return error_mark_node;
+      if (uninitialized_error)
+       {
+         if (complain & tf_error)
+           diagnose_uninitialized_cst_or_ref_member (elt_type,
+                                                     /*using_new*/true);
+         return error_mark_node;
+       }
     }
 
   if (CP_TYPE_CONST_P (elt_type) && *init == NULL