Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?
-- >8 --
Recently I had to parse this condition and it was a grievous experience.
I did not end up changing it in the end, but we still may want to
factor it out for the next reader.
gcc/cp/ChangeLog:
* decl.cc (do_full_aggr_init_p): New, factored out of...
(check_initializer): ...here. Use it.
---
gcc/cp/decl.cc | 45 +++++++++++++++++++++++++++++++++------------
1 file changed, 33 insertions(+), 12 deletions(-)
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 23f23b39544..50a5684d1a3 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -8430,6 +8430,38 @@ build_aggr_init_full_exprs (tree decl, tree init, int
flags)
return build_aggr_init (decl, init, flags, tf_warning_or_error);
}
+/* Return true if we should call build_aggr_init_full_exprs in
+ check_initializer. INIT is the initializer for DECL. TYPE is
+ the type of DECL. */
+
+static bool
+do_full_aggr_init_p (tree decl, tree type, tree init, int flags)
+{
+ /* Always use build_aggr_init for array decomposition. */
+ if (DECL_DECOMPOSITION_P (decl) && TREE_CODE (type) == ARRAY_TYPE)
+ return true;
+
+ if (flags & LOOKUP_ALREADY_DIGESTED)
+ return false;
+
+ if (!(type_build_ctor_call (type) || CLASS_TYPE_P (type)))
+ return false;
+
+ if (init
+ && BRACE_ENCLOSED_INITIALIZER_P (init)
+ && CP_AGGREGATE_TYPE_P (type)
+ && (CLASS_TYPE_P (type)
+ /* The call to build_aggr_init below could end up
+ calling build_vec_init, which may break when we
+ are processing a template. */
+ || processing_template_decl
+ || !TYPE_NEEDS_CONSTRUCTING (type)
+ || type_has_extended_temps (type)))
+ return false;
+
+ return true;
+}
+
/* Verify INIT (the initializer for DECL), and record the
initialization in DECL_INITIAL, if appropriate. CLEANUP is as for
grok_reference_init.
@@ -8585,18 +8617,7 @@ check_initializer (tree decl, tree init, int flags,
vec<tree, va_gc> **cleanups)
if (type == error_mark_node)
return NULL_TREE;
- if (((type_build_ctor_call (type) || CLASS_TYPE_P (type))
- && !(flags & LOOKUP_ALREADY_DIGESTED)
- && !(init && BRACE_ENCLOSED_INITIALIZER_P (init)
- && CP_AGGREGATE_TYPE_P (type)
- && (CLASS_TYPE_P (type)
- /* The call to build_aggr_init below could end up
- calling build_vec_init, which may break when we
- are processing a template. */
- || processing_template_decl
- || !TYPE_NEEDS_CONSTRUCTING (type)
- || type_has_extended_temps (type))))
- || (DECL_DECOMPOSITION_P (decl) && TREE_CODE (type) == ARRAY_TYPE))
+ if (do_full_aggr_init_p (decl, type, init, flags))
{
init_code = build_aggr_init_full_exprs (decl, init, flags);
base-commit: 32cd422ee5c968a4255b6def4270b69f45c9abd0
--
2.54.0
