From patchwork Wed Jul 13 10:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a98:d5ce:0:b0:178:cc93:bf7d with SMTP id g14csp167400eik; Wed, 13 Jul 2022 03:14:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vYeFgGkjAv68wR+4834Xu5rVw7jcvYCBj6q64bxlciVkxXkX1b00Bnu2U2t9PEfX15afic X-Received: by 2002:a17:907:7388:b0:72b:9be1:e32d with SMTP id er8-20020a170907738800b0072b9be1e32dmr2196595ejc.611.1657707241999; Wed, 13 Jul 2022 03:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657707241; cv=none; d=google.com; s=arc-20160816; b=TRIwu85QM0wjFEj960PxR4a2ep9Zh+J9KaOEcchEoYbOQJYpCZB5cpJN1OOAt2ljQS SjvBoNX8TrX/NXm5fpzni2Bth6erSa+yb5e1sF3xnsjfaXIKNuGPoV//AO3hjeac3BTK Dhkavf0dtxKwars+RkPZBc434xwI9zB7Dd9gQX0Dr2UL03qiV4+aseqbkPNZ6vom04ji 5l9O4YVwRE7IELIm0I29u5AIXakL/S/qMqnPqjiL+yrSWiH76hX/N0Jqc0eoCl5cu23d xbjU7s91Wnh0ye5ys4iSbsHiwliqSIt/eZKRO+7RunX2qf/AEh3fvWRIDA9l+8XpBeke YWjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=CDmz/BuvYYvOtTfw6q23Ike19X67BmlbgbDrdM3RXy0=; b=F4fd4yr/NpfVXrgCmEop3hLD406xC9Kz9UsZ98UDYCRdOBkSvSOvu9sT33vGeu7VXy XCUOvtS+/B0FEyo36pNFefj8TFCDZ2Uejghn2mSfoC9S8uM9F/Kc/r5Yv0wRoqrg4nb9 qQ/lyJDtkyG2fdoY/4p4uZGxpUJkSJEpbZ6iNlZMRsHRLubWRutTU8twrdKGT9VTPV23 6b85uXkP6RVOGR84zjpn7vq7bMK83VWonZzzVeqHES/ydDY9ZRn0YNBlJiHEPhjekMRo HvuobbSNLVF1VTIahMrdRysuSroP+BIfPFPsRCmYRE9ya36II8mMbJH/dgyYd1l/YDt9 ZUgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=LzbFdJhW; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id nb26-20020a1709071c9a00b0072ae569d6a0si5511966ejc.632.2022.07.13.03.14.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 03:14:01 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=LzbFdJhW; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B80C038316FD for ; Wed, 13 Jul 2022 10:07:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B80C038316FD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657706876; bh=CDmz/BuvYYvOtTfw6q23Ike19X67BmlbgbDrdM3RXy0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=LzbFdJhWIeutNKI5rQEoRMHWxxlQz2N2MMPNh8VeVGtDOMrJA5HgKwvw8agXMxKO7 OxwHDvlJ38ikej1kfDyN3v14GSQGYWgPsj4nkoUIXm6DXK8hyAueMQEIMTzQ6ea55z IGv8XKF7D/oQK3cR6RERWT5HWF7P/D2vDaolwe3E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 3668D3850853 for ; Wed, 13 Jul 2022 10:03:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3668D3850853 Received: by mail-ed1-x531.google.com with SMTP id x91so13434461ede.1 for ; Wed, 13 Jul 2022 03:03:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=CDmz/BuvYYvOtTfw6q23Ike19X67BmlbgbDrdM3RXy0=; b=3ySyoJ4ixIXeIKSymYbxs22iaw2N+pRzaAez3NDcMYxkweLd4+/ZSc1Sb3HHjN9AEA 8qHyWcL0DpZTnVAyvp0i6nJKnDU1u7lbBm8pQupz/LE5NmTMASR5855glGlLwBGiaxQJ 3nAhNigCnW07JVZ6UUqm80AAlyUkH3LGAArWJhDl8/RBpPgvXQdJ64ohaL1staUhJIEu xaGnrF46ulHNFQi4OtC3m1BiXgHymhEKg17Wob+laDaWWEwfJ/ursV0apj0mefhXlF2y EvrGoYayYZ3YxeSt9rx/F7FywpMGjSUD6Hbk1IWAVRmdSOd5hIgfJCbmZV74/t5LKDRA b/Ew== X-Gm-Message-State: AJIora9scr9b2BAwxHg1xlUj5aFvTngNQs/0hNqESH+J04NIJlwECcai ujrEssml+fssUheFki1TN819HjpZVCMqug== X-Received: by 2002:a05:6402:2812:b0:43a:9041:d5db with SMTP id h18-20020a056402281200b0043a9041d5dbmr3601647ede.208.1657706581942; Wed, 13 Jul 2022 03:03:01 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id h8-20020aa7cdc8000000b004355998ec1asm7575395edw.14.2022.07.13.03.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 03:03:01 -0700 (PDT) Date: Wed, 13 Jul 2022 10:03:00 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix internal error on instance of Ada.Task_Attributes at -O Message-ID: <20220713100300.GA994742@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Eric Botcazou Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1738232029126610973?= X-GMAIL-MSGID: =?utf-8?q?1738232029126610973?= This happens when there is a size mismatch, but this must be accepted. Tested on x86_64-pc-linux-gnu, committed on trunk 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 --git a/gcc/ada/gcc-interface/utils.cc b/gcc/ada/gcc-interface/utils.cc --- 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); } }