From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id CC31D3856973 for ; Fri, 28 Jul 2023 07:30:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CC31D3856973 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4f95bf5c493so3075740e87.3 for ; Fri, 28 Jul 2023 00:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1690529444; x=1691134244; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=t/UsrShTuuKbEUdKCltKkTOmNecto7gB9e9J0JAYWOY=; b=HFpaUaQLlsRe4PU38/cngJTONUMXec2R1qZVkHc1M9W8j94xb3Rme/QH9dIIBHTXuC s+IMU2MvAN9soOZu+LNPFje7kLuStlvFRBfzrrmJhNDg2bvlTyZ8fZss4gJI9R0V0cMU fBHkM1t7ulBxIUQC7T5SVEIXmJJeTfCsVE/QnTQJuxZvwYpGznhZtiVkELZFTYpb2NUY 2T25bimWAd0tr3gSs4JUWiBItM42ThrySGKcLhraBVeHX7u2UJ0m8JbeKR4UFEgCa1dd NOm+QibwAIqpVzSUGAtt1YGzBZbKult7i/LK3wJysIv95xJQGiYXQqCS2P7pL92/c2hd K1UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690529444; x=1691134244; 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=t/UsrShTuuKbEUdKCltKkTOmNecto7gB9e9J0JAYWOY=; b=L/ur/x/qDevO3NK+XVe07TwNSA/CKPTZucaoD/OoqgRWBqY47P76iyJGO/qI3eh5LH 6dPjZXDgaZ3X1bLDYqmOnxAuxSqwF4aHmOEYSohKtXYIZE2Qp9a8gqvbcIvU9w9Zw7e2 FpRsTHvVm4njo0sThqrVWj8HO7Doan+9RgGsGKvs1+Os/MkqA7BlZYeQFvsuyRj8TyvP yOl/q7w+UEdhdk5vaiOCkZOTYU6WulEptytAxJ7SI4PSEGnIF5MLLGZvwKCkHTXZfANS qCUIgxbBKBwO99cGNyMggO5rBXB3JtOe3KCAmkP6hUr8fUSp1nEa+zzmt3MfdwYwQ9Wm XY7g== X-Gm-Message-State: ABy/qLZQQWTL4tZc7chTr7eTD+PZ26Mz9kphHYoLx4wJFiEZa8qM34Fb KXXdLAC26OYzIsMVM+sGOWy4mW8VBTFb/OX96AJ6cw== X-Google-Smtp-Source: APBJJlHKztQ2qkiV7cQIqMUK61UmifnVX8Gn61c1RS8Yz9u0OrtbWBpc56EMi1Uh3tqXXZUmnyyWlg== X-Received: by 2002:a2e:2403:0:b0:2b9:a63f:6415 with SMTP id k3-20020a2e2403000000b002b9a63f6415mr1059220ljk.5.1690529444707; Fri, 28 Jul 2023 00:30:44 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:792d:7d2b:d7e:14a3]) by smtp.gmail.com with ESMTPSA id y19-20020a7bcd93000000b003fc06169ab3sm6333844wmj.20.2023.07.28.00.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 00:30:44 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Allow calls to Number_Formals when no formals are present Date: Fri, 28 Jul 2023 09:30:42 +0200 Message-Id: <20230728073042.1852207-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: From: Piotr Trojanek It is much simpler and safer for the routine Number_Formals to accept subprogram entities that have no formals. gcc/ada/ * einfo-utils.adb (Number_Formals): Change types in body. * einfo-utils.ads (Number_Formals): Change type in spec. * einfo.ads (Number_Formals): Change type in comment. * sem_ch13.adb (Is_Property_Function): Fix style in a caller of Number_Formals that was likely to crash because of missing guards. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/einfo-utils.adb | 4 ++-- gcc/ada/einfo-utils.ads | 2 +- gcc/ada/einfo.ads | 2 +- gcc/ada/sem_ch13.adb | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb index dad3a654743..7fe517124d9 100644 --- a/gcc/ada/einfo-utils.adb +++ b/gcc/ada/einfo-utils.adb @@ -2105,8 +2105,8 @@ package body Einfo.Utils is -- Number_Formals -- -------------------- - function Number_Formals (Id : E) return Pos is - N : Int; + function Number_Formals (Id : E) return Nat is + N : Nat; Formal : Entity_Id; begin diff --git a/gcc/ada/einfo-utils.ads b/gcc/ada/einfo-utils.ads index fee771c20f4..20ca470d7ac 100644 --- a/gcc/ada/einfo-utils.ads +++ b/gcc/ada/einfo-utils.ads @@ -227,7 +227,7 @@ package Einfo.Utils is function Next_Stored_Discriminant (Id : E) return Entity_Id; function Number_Dimensions (Id : E) return Pos; function Number_Entries (Id : E) return Nat; - function Number_Formals (Id : E) return Pos; + function Number_Formals (Id : E) return Nat; function Object_Size_Clause (Id : E) return Node_Id; function Parameter_Mode (Id : E) return Formal_Kind; function Partial_Refinement_Constituents (Id : E) return L; diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index b356b76f0de..d7690d9f88a 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -3832,7 +3832,7 @@ package Einfo is -- Number_Formals (synthesized) -- Applies to subprograms and subprogram types. Yields the number of --- formals as a value of type Pos. +-- formals as a value of type Nat. -- Object_Size_Clause (synthesized) -- Applies to entities for types and subtypes. If an object size clause diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 585c0f33d8b..7cd0800a56c 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -16544,7 +16544,11 @@ package body Sem_Ch13 is It : Interp; function Is_Property_Function (E : Entity_Id) return Boolean; - -- Implements RM 7.3.4 definition of "property function". + -- Implements RM 7.3.4 definition of "property function" + + -------------------------- + -- Is_Property_Function -- + -------------------------- function Is_Property_Function (E : Entity_Id) return Boolean is begin -- 2.40.0