From fe5b6c1c500c808353b51952d8165005bb8ef3e2 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 14 Nov 2001 12:53:09 +0000 Subject: [PATCH] decl.c (check_initializer): Try to complete the type of an array element before checking whether it's complete. * decl.c (check_initializer): Try to complete the type of an array element before checking whether it's complete. Don't complain about arrays with complete element types but an unknown size. (cp_finish_decl): Build the hierarchical constructor before calling maybe_deduce_size_from_array_init. From-SVN: r47008 --- gcc/cp/ChangeLog | 9 +++++++++ gcc/cp/decl.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0454d024b09..5717f57bb46 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2001-11-14 Richard Sandiford + + * decl.c (check_initializer): Try to complete the type of an + array element before checking whether it's complete. Don't + complain about arrays with complete element types but an + unknown size. + (cp_finish_decl): Build the hierarchical constructor before + calling maybe_deduce_size_from_array_init. + 2001-11-14 Joseph S. Myers * Make-lang.in: Change all uses of $(manext) to $(man1ext). diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a210a7b830f..39708f9114b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7709,12 +7709,12 @@ check_initializer (decl, init) init = NULL_TREE; } else if (TREE_CODE (type) == ARRAY_TYPE - && !COMPLETE_TYPE_P (TREE_TYPE (type))) + && !COMPLETE_TYPE_P (complete_type (TREE_TYPE (type)))) { cp_error ("elements of array `%#D' have incomplete type", decl); init = NULL_TREE; } - else if (!COMPLETE_TYPE_P (type)) + else if (TREE_CODE (type) != ARRAY_TYPE && !COMPLETE_TYPE_P (type)) { cp_error ("`%D' has incomplete type", decl); TREE_TYPE (decl) = error_mark_node; @@ -8154,8 +8154,8 @@ cp_finish_decl (decl, init, asmspec_tree, flags) } /* Deduce size of array from initialization, if not already known. */ - maybe_deduce_size_from_array_init (decl, init); init = check_initializer (decl, init); + maybe_deduce_size_from_array_init (decl, init); GNU_xref_decl (current_function_decl, decl); -- 2.30.2