From patchwork Mon Nov 21 10:14:53 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: 60914 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 0383E38AA264 for ; Mon, 21 Nov 2022 10:17:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0383E38AA264 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669025837; bh=jAhiEcoyCshwB6cDBp6bqq/bD8hQVoFp51TaIyt0qm4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Y0RStTbEGjffZw84Mzb4PY/MoVzhu40mtE2/LfHLft93Bmkb8WIF/xqigo4k7XS9+ FCzf1rUeS2BKfFWSYBJfNmuZIx9dLMoKUnPyGNYiBcsflpvvlI/t9JWaq784BQt4Vl cWUUG39VuqesDThdHvfL9sHq20bispBLtlk+xVWA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 104473896C22 for ; Mon, 21 Nov 2022 10:14:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 104473896C22 Received: by mail-wr1-x434.google.com with SMTP id l14so198936wrw.13 for ; Mon, 21 Nov 2022 02:14:57 -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=jAhiEcoyCshwB6cDBp6bqq/bD8hQVoFp51TaIyt0qm4=; b=BZ+R8aObGmYpfbCCYiEO1Qtcig2fyZVMrdmcAT88mdcZFJHWLEWcqtFDuNKFdhK17M msmu6UDjBohZARlWY/tfCS2ywJiNogW4Oqhu63VTdeOWk6iLU4EsgYpOT6eRRnwoxq1R F7yJe0iqhdtRhQ7VjwraynSSKg2im6NRubScaciXbHL0OllZSfroWWGlQEtt98vo9I5f wuaBBxAkotawQndw0k/RUmqk5iaqTjd8cmvs2C3WiaD1EP9wfZ8/36yJKqw8/H5kD1yy WJ+t3rljBsQpvP659e09AV4nrVxrP+tEcrNPIv4blROtL6goH23tdTTfYjjajv+mwTxd vg7w== X-Gm-Message-State: ANoB5plyxLy6YfDC5QX1RmolsrCFuPIRpvA0AiV+rCe/s9Y/tfxrS6eR gBGSruLU1Bf65FBT/X86Gq75uT39OiSTAA== X-Google-Smtp-Source: AA0mqf7HmLpwhcQ09QdcYu/UlVgFePTSKqW3ZExzvdThllRmsOwXm3dDhPCUnGtSys6mSScnGl7cjg== X-Received: by 2002:adf:f8ca:0:b0:241:c933:4b0e with SMTP id f10-20020adff8ca000000b00241c9334b0emr3723854wrq.48.1669025696691; Mon, 21 Nov 2022 02:14:56 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id bt21-20020a056000081500b00241cbb7f15csm6154231wrb.106.2022.11.21.02.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 02:14:56 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Adjust recent change for returns involving function calls Date: Mon, 21 Nov 2022 11:14:53 +0100 Message-Id: <20221121101453.259725-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 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 gcc/ada/ * gcc-interface/decl.cc (gnat_to_gnu_entity) : Revert latest change. * gcc-interface/trans.cc (gnat_to_gnu) : Tweak latest change. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gcc-interface/decl.cc | 11 ----------- gcc/ada/gcc-interface/trans.cc | 11 ++++++++--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc index e25ce498f2c..c383f9b218a 100644 --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -637,17 +637,6 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) break; case E_Constant: - /* If this is a constant related to a return in a function returning by - invisible reference without expression, get the return object. */ - if (Is_Related_To_Func_Return (gnat_entity) - && current_function_decl - && TREE_ADDRESSABLE (TREE_TYPE (current_function_decl)) - && !gnu_expr) - { - gnu_decl = DECL_RESULT (current_function_decl); - break; - } - /* Ignore constant definitions already marked with the error node. See the N_Object_Declaration case of gnat_to_gnu for the rationale. */ if (definition diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index d0ff741585e..1cd621a9377 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -6482,9 +6482,10 @@ gnat_to_gnu (Node_Id gnat_node) then elide the temporary by forwarding the return object to Func: + result_type *Rnn = (result_type *) ; * = Func (); [return slot optimization] [...] - return ; + return Rnn; That's necessary if the result type needs finalization because the temporary would never be adjusted as Expand_Simple_Function_Return @@ -6496,8 +6497,12 @@ gnat_to_gnu (Node_Id gnat_node) && current_function_decl && TREE_ADDRESSABLE (TREE_TYPE (current_function_decl))) { - gnu_result = gnat_to_gnu_entity (gnat_temp, NULL_TREE, true); - gnu_result = build_unary_op (INDIRECT_REF, NULL_TREE, gnu_result); + gnat_to_gnu_entity (gnat_temp, + DECL_RESULT (current_function_decl), + true); + gnu_result + = build_unary_op (INDIRECT_REF, NULL_TREE, + DECL_RESULT (current_function_decl)); gnu_result = Call_to_gnu (Prefix (Expression (gnat_node)), &gnu_result_type, gnu_result,