From patchwork Mon May 29 08:29:48 2023 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: 70229 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 25476389838C for ; Mon, 29 May 2023 08:36:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 25476389838C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685349418; bh=RjCk0Vae86YMt3UiRKrH0aKY15w34d8ovSIAIPN/5UE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=TRZ1l0ArIgEDEaJc37nuiDwhk3WRgFV+cCfoTCLhAcMtVc7SjHrM0Bt/Q/4pKZ92I iCUuYuBsT8O0kGXrOYBI5LOzKFK4+s9wqDMYf0zMhgDGCCSug1tWVMWMxLTyXIkoZ2 bS0t5Gtg3rs6lKcULSkQ4FMCLaIdv5jqWHlJ4yGw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 89821384DA7A for ; Mon, 29 May 2023 08:29:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89821384DA7A Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-30ae61354fbso782556f8f.3 for ; Mon, 29 May 2023 01:29:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685348989; x=1687940989; 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=RjCk0Vae86YMt3UiRKrH0aKY15w34d8ovSIAIPN/5UE=; b=TEYXUKkJ0gd6zF5WZmdagH/+Xtj6QCuV1ewilE3pUdoshBMW1lrGt6nGhWF+aygXCA 2vYvwvRtxthYBK5XEXIQznAfxG/miZV0oCj7ZyEefe9oFmvhtgIiPvVKMVXzR6Wr/FDy 68WCZFypUD7Jt3fzmBlEfsbjeHQWGrsyoMfFtGfVe37342bFh1eKGcaZJ0i/4KKCeBQz oUUe9v0kZ/v6qTqMH8Dp2dSrPyJyf3FjvoRke2zO3A5kjcGhpuVOj24Yg+XDOjxkT/Uv 3Qen8pLRAz2PzjwHeTrXj6ukviEnQxbl6GbPWqb+RU9xLD3X1fvU5lKFGLAxjtdqrl2X ZafA== X-Gm-Message-State: AC+VfDzJhX5SLI6DWFmsZxJf6M6ZEz9tA4YQKWwgI2Hp51Ds/OfkOXpw 4t4/UAmmDh+8jLdK9dLWAhOQ46d49TQSFKsgtb1aPA== X-Google-Smtp-Source: ACHHUZ6W4SKib8OwsTk5iTOmdmBdzVW++1HN2/LeUGYTc0MepreZ43cmhdHuMWCxjDnBe+HaO1HP/Q== X-Received: by 2002:adf:ce91:0:b0:306:34f6:de8a with SMTP id r17-20020adfce91000000b0030634f6de8amr8219869wrn.71.1685348989380; Mon, 29 May 2023 01:29:49 -0700 (PDT) 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 k5-20020adfd845000000b0030ae53550f5sm6106839wrl.51.2023.05.29.01.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 01:29:48 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Fix crash on semi-recursive call in access-to-subprogram contract Date: Mon, 29 May 2023 10:29:48 +0200 Message-Id: <20230529082948.2411007-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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: =?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: Piotr Trojanek Calls to access-to-subprogram from its own pre/post aspects are rejected as illegal, e.g.: type F is access function (X : Natural) return Boolean with Pre => F.all (X); but they caused an assertion failure in detection of recursive calls. Now they are properly recognized as recursive, but the error is suppressed, because it has been already posted at the call node. gcc/ada/ * sem_res.adb (Invoked_With_Different_Arguments): Use Get_Called_Entity, which properly deals with calls via an access-to-subprogram; fix inconsistent use of a Call object declared in enclosing subprogram. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_res.adb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 1d4b9acb8ea..8a5f87b80ed 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -947,7 +947,7 @@ package body Sem_Res is -------------------------------------- function Invoked_With_Different_Arguments (N : Node_Id) return Boolean is - Subp : constant Entity_Id := Entity (Name (N)); + Subp : constant Entity_Id := Get_Called_Entity (N); Actual : Node_Id; Formal : Entity_Id; @@ -956,7 +956,7 @@ package body Sem_Res is -- Determine whether the formals of the invoked subprogram are not -- used as actuals in the call. - Actual := First_Actual (Call); + Actual := First_Actual (N); Formal := First_Formal (Subp); while Present (Actual) and then Present (Formal) loop