From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id ED0C13829BDE; Wed, 13 Jul 2022 10:04:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED0C13829BDE MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1672] [Ada] Fix internal error on instance of Ada.Task_Attributes at -O X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: 6071ef0bed2081dd1ecd89299127ae07077df1f3 X-Git-Newrev: 2b8c12348da3eb770968b718a9ace9fb8fba246f Message-Id: <20220713100407.ED0C13829BDE@sourceware.org> Date: Wed, 13 Jul 2022 10:04:07 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2022 10:04:08 -0000 https://gcc.gnu.org/g:2b8c12348da3eb770968b718a9ace9fb8fba246f commit r13-1672-g2b8c12348da3eb770968b718a9ace9fb8fba246f Author: Eric Botcazou Date: Wed Jun 22 20:13:20 2022 +0200 [Ada] Fix internal error on instance of Ada.Task_Attributes at -O This happens when there is a size mismatch, but this must be accepted. gcc/ada/ * gcc-interface/utils.cc (unchecked_convert): Also pad in most cases if the source is not a scalar type but the destination is. Diff: --- gcc/ada/gcc-interface/utils.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gcc/ada/gcc-interface/utils.cc b/gcc/ada/gcc-interface/utils.cc index 6111311ba2a..05adacd52ea 100644 --- a/gcc/ada/gcc-interface/utils.cc +++ b/gcc/ada/gcc-interface/utils.cc @@ -5503,8 +5503,8 @@ unchecked_convert (tree type, tree expr, bool notrunc_p) expr = unchecked_convert (type, expr, notrunc_p); } - /* If we are converting from a scalar type to a type with a different size, - we need to pad to have the same size on both sides. + /* If we are converting between fixed-size types with different sizes, we + need to pad to have the same size on both sides. ??? We cannot do it unconditionally because unchecked conversions are used liberally by the front-end to implement interface thunks: @@ -5515,8 +5515,10 @@ unchecked_convert (tree type, tree expr, bool notrunc_p) so we need to skip dereferences. */ else if (!INDIRECT_REF_P (expr) - && !AGGREGATE_TYPE_P (etype) + && TREE_CODE (expr) != STRING_CST + && !(AGGREGATE_TYPE_P (etype) && AGGREGATE_TYPE_P (type)) && ecode != UNCONSTRAINED_ARRAY_TYPE + && TREE_CONSTANT (TYPE_SIZE (etype)) && TREE_CONSTANT (TYPE_SIZE (type)) && (c = tree_int_cst_compare (TYPE_SIZE (etype), TYPE_SIZE (type)))) { @@ -5532,15 +5534,18 @@ unchecked_convert (tree type, tree expr, bool notrunc_p) tree rec_type = maybe_pad_type (type, TYPE_SIZE (etype), 0, Empty, false, false, true); expr = unchecked_convert (rec_type, expr, notrunc_p); - expr = build_component_ref (expr, TYPE_FIELDS (rec_type), false); + expr = build3 (COMPONENT_REF, type, expr, TYPE_FIELDS (rec_type), + NULL_TREE); } } - /* Likewise if we are converting from a scalar type to a type with self- + /* Likewise if we are converting from a fixed-szie type to a type with self- referential size. We use the max size to do the padding in this case. */ else if (!INDIRECT_REF_P (expr) - && !AGGREGATE_TYPE_P (etype) + && TREE_CODE (expr) != STRING_CST + && !(AGGREGATE_TYPE_P (etype) && AGGREGATE_TYPE_P (type)) && ecode != UNCONSTRAINED_ARRAY_TYPE + && TREE_CONSTANT (TYPE_SIZE (etype)) && CONTAINS_PLACEHOLDER_P (TYPE_SIZE (type))) { tree new_size = max_size (TYPE_SIZE (type), true); @@ -5557,7 +5562,8 @@ unchecked_convert (tree type, tree expr, bool notrunc_p) tree rec_type = maybe_pad_type (type, TYPE_SIZE (etype), 0, Empty, false, false, true); expr = unchecked_convert (rec_type, expr, notrunc_p); - expr = build_component_ref (expr, TYPE_FIELDS (rec_type), false); + expr = build3 (COMPONENT_REF, type, expr, TYPE_FIELDS (rec_type), + NULL_TREE); } }