2012-12-07 Paolo Carlini <paolo.carlini@oracle.com>

	* tree.c (build_aggr_init_expr): Remove tsubst_flags_t parameter.
	(build_cplus_new): Adjust.
	* cp-tree.h: Adjust declaration.
	* init.c (build_value_init): Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194312 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 81c2048..e6138cd 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * tree.c (build_aggr_init_expr): Remove tsubst_flags_t parameter.
+       (build_cplus_new): Adjust.
+       * cp-tree.h: Adjust declaration.
+       * init.c (build_value_init): Adjust.
+
 2012-12-07  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/54401

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index ceac093..2741abc 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -5762,7 +5762,7 @@ extern tree build_min_nt_loc                      (location_t, enum tree_code,
 extern tree build_min_non_dep                  (enum tree_code, tree, ...);
 extern tree build_min_non_dep_call_vec         (tree, tree, vec<tree, va_gc> *);
 extern tree build_cplus_new                    (tree, tree, tsubst_flags_t);
-extern tree build_aggr_init_expr               (tree, tree, tsubst_flags_t);
+extern tree build_aggr_init_expr               (tree, tree);
 extern tree get_target_expr                    (tree);
 extern tree get_target_expr_sfinae             (tree, tsubst_flags_t);
 extern tree build_cplus_array_type             (tree, tree);

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 2206c16..6edc0a5 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -350,8 +350,7 @@ build_value_init (tree type, tsubst_flags_t complain)
          (type,
           build_special_member_call (NULL_TREE, complete_ctor_identifier,
                                      NULL, type, LOOKUP_NORMAL,
-                                     complain),
-          complain);
+                                     complain));
       else if (TYPE_HAS_COMPLEX_DFLT (type))
        {
          /* This is a class that needs constructing, but doesn't have
@@ -361,7 +360,7 @@ build_value_init (tree type, tsubst_flags_t complain)
          tree ctor = build_special_member_call
            (NULL_TREE, complete_ctor_identifier,
             NULL, type, LOOKUP_NORMAL, complain);
-         ctor = build_aggr_init_expr (type, ctor, complain);
+         ctor = build_aggr_init_expr (type, ctor);
          if (ctor != error_mark_node)
            AGGR_INIT_ZERO_FIRST (ctor) = 1;
          return ctor;

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index ca82f75..ca209eb 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -407,7 +407,7 @@ build_aggr_init_array (tree return_type, tree fn, tree slot, int nargs,
    callable.  */
 
 tree
-build_aggr_init_expr (tree type, tree init, tsubst_flags_t /*complain*/)
+build_aggr_init_expr (tree type, tree init)
 {
   tree fn;
   tree slot;
@@ -469,7 +469,7 @@ build_aggr_init_expr (tree type, tree init, tsubst_flags_t /*complain*/)
 tree
 build_cplus_new (tree type, tree init, tsubst_flags_t complain)
 {
-  tree rval = build_aggr_init_expr (type, init, complain);
+  tree rval = build_aggr_init_expr (type, init);
   tree slot;
 
   /* Make sure that we're not trying to create an instance of an