From patchwork Thu Nov 24 10:12:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 61068 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 65EE33852C66 for ; Thu, 24 Nov 2022 10:14:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 65EE33852C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669284857; bh=IuQesOJny4iJ7vdRSspIKpylxc7PfY31neOXFsw6/CE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=j2ip4ld7WuiXnm9KhjyKRHiL/INEJcFL4ZpA9D2HSaw84TUMrV1FmamHuaje8rHbZ zR+g6wRAAIdvba6Bo3MJ+j0qU7rqYOHR8g530+dzABPgWMPAiStcYuM4DxFBcDH5n1 22vtWkA0JGiIpmWNTo8nqNaQuSm+tGjf+wXzu2KI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id 2784E38432E9 for ; Thu, 24 Nov 2022 10:13:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2784E38432E9 Received: by mail-wr1-x430.google.com with SMTP id b12so1781404wrn.2 for ; Thu, 24 Nov 2022 02:13:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IuQesOJny4iJ7vdRSspIKpylxc7PfY31neOXFsw6/CE=; b=OnXyKzGwfSwDTys9hODwzAvWl6qTV2tIeP847L+QRZnT/qvGT/n1xJV71r4GwP7Pn5 nPCuF0OOfZ4EpRaMjEtVhXEA4/0/07sYoMkVxkpgFtUNRjQQ5UvEJxYFFZ+wLjS/Lx10 xcNCyNTKZF9nOz6/GfPnkj/FXK+ImtW1vvWJz76eF9iH2jEGoeejNIX18rSZ8WPshUQy 9XByd2R2/lWKPMC/cvDdXmtUmuivMfYlYO4TZi5i3mE8b/A2VhkLA8n9KJyTG3GRA9SJ CAwfst7M510EVO9GmPOArbGHJczDrN/ceRk2cje0kljq4GNXUG21tfcmCt/yxz+98zp7 jQjQ== X-Gm-Message-State: ANoB5pmvWpbwixjYAXBPAnsAC7AHmjijU+nfwOms/PwayWIe1Bxkws3I 9Z1mG/hEkOHR/ofSv6sfNsdOSZaIAb7zaw== X-Google-Smtp-Source: AA0mqf4GEgC3fPlfR5UNdbE4P/lfnBpnUDBHmDsJ3p9ngoAckbsAJSnYWf1+Csj3RTLEmHZk9FMe1A== X-Received: by 2002:a5d:564d:0:b0:225:2e65:7440 with SMTP id j13-20020a5d564d000000b002252e657440mr20086569wrw.6.1669284780989; Thu, 24 Nov 2022 02:13:00 -0800 (PST) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id p15-20020a05600c468f00b003cfaae07f68sm2228440wmo.17.2022.11.24.02.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 02:13:00 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Add assertion for the implementation of storage models Date: Thu, 24 Nov 2022 11:12:58 +0100 Message-Id: <20221124101258.445328-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 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: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Eric Botcazou We cannot generate a call to memset for an aggregate with an Others choice when the target of the assignment has a storage model with Copy_To routine. gcc/ada/ * gcc-interface/trans.cc (gnat_to_gnu) : Add assertion that memset is not supposed to be used when the target has a storage model with Copy_To routine. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gcc-interface/trans.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index 1cd621a9377..b9d7c015a73 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -7450,6 +7450,9 @@ gnat_to_gnu (Node_Id gnat_node) else if (Present (gnat_smo) && Present (Storage_Model_Copy_To (gnat_smo))) { + /* We obviously cannot use memset in this case. */ + gcc_assert (!use_memset_p); + tree t = remove_conversions (gnu_rhs, false); /* If a storage model load is present on the RHS then instantiate