From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 0B3C03882066 for ; Thu, 13 Jun 2024 13:33:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B3C03882066 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0B3C03882066 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718285635; cv=none; b=g0KnAF4qmklOHI4gmELeARe1u5Ce8V7nuPMLx05St+xwfCkZYkgn+Y8x+J2q1VvX+2z7cPEF41xzpZ7Qq0SUFp+4AAaQ4ZpUCumMYy6LElNi2MC57Mhe4aDO/x1oiCYhvnB/Utd0sWxjxvHxU0MQ3cMlC2mojpOHZTFFU4iLjuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718285635; c=relaxed/simple; bh=ux21BS2H3yxCtYl2rs7rSpFeR5coZRccW/lkh215zZM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=c1tJPW89Qo5jXl6NL9Jmx8WP5F8NyCdGIhRnxtUzbVVLw/OxrjP50czesKeXbsu0qntg2CR+o09HqYbi69PqSPe7oqSIERAz8MCr3KbNhxiJLv6lbqshM+uueL+UTHrt/J39oUY3YKisal5sm8rXDxk2haWIjgrna1n8wC82TUw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-421820fc26dso9199075e9.2 for ; Thu, 13 Jun 2024 06:33:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1718285633; x=1718890433; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IXcbvqYAW59qK9UIPVkTk0ZJ2AgxUHpikoHbsBjMx9I=; b=CE612BBXCS7xb3+HZmM7imoYD/CK9qKxCZRzB04OEsiQTo/vjUX/vGzEvyUV8wkjQd pYvHZdQqvojd/gkGZMXzjMoKlFdzxrNkxCI9v2YLDWf4C5/cSRBOXm6YqcQfnJFMQYNf cO1qU7bxoruEYhn0PSrE07QfaMjWX41sxAsxNQQJ6Z4XOuUOUmn5Nj/9BTDyqeHxVrbn pgAPlAUL6NlxJ8JMoofzZ+y3dg8ExOm2DEPwhlr75mqFYa4DL/Lt74728LyFkFzCgdee NPu6aGyE/LaJ4FJtUz01JbTR1T7KPddIFPGtcgq63BSJhEoei3Dvn5g7TuLJyT0j5Gsb GcPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718285633; x=1718890433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IXcbvqYAW59qK9UIPVkTk0ZJ2AgxUHpikoHbsBjMx9I=; b=ny0/hrhpK3SIEEfuR/erC+ggTvNWuY5LK9Z8bay92TWjTq+psqf1TDh8MDReZMuFVB LB3IHtPakKZFoolqEOC23bU4aUZZ6SHmEEBDdCek55l7sycomSkuJYYZoW2mdkPrI75i 3EMU/kRY6gmIYdL1OnRKr9/ET2RggJ52IMLeDg6VAG0U4j6YJzg2QfLzLM6FhUfKiGFF bTggljYvP9wC2eNO6AeVCqQ2813kpOzTZBI+Gl6ANS5zFLJxJt37ksRBy6glporkJHNT azeIjzJ0mLe6yi4Oif9VC2O+COAwgYZ9NhVdAYLkagK+vtg7S/4kXKPFKW8OJzXlVWFT 5mcw== X-Gm-Message-State: AOJu0YyPmjtCigNR6tiVfPTNZ5OmPeIHe1Tew0bOBwQWbqMzJGRXfpNo qg7G2WnCwn8+Ke8KqvZJmmLE2nhzm/FbqpdeWK7ug2nPBN/lxK0Y/PZLSYHF5mvGuFatCYCiUg0 = X-Google-Smtp-Source: AGHT+IEs7FdUY6wo5GZBSjKy+iRBHFddkX/H1RvKYZPfZrBRl+5+VlwSAiIP9HTJDX/e9HrETeK2OA== X-Received: by 2002:a05:600c:3546:b0:422:47a:15c8 with SMTP id 5b1f17b1804b1-422863ad92cmr43928085e9.12.1718285632799; Thu, 13 Jun 2024 06:33:52 -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 5b1f17b1804b1-422870e9145sm62391955e9.22.2024.06.13.06.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 06:33:52 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED 04/30] ada: Simplify checks for Address and Object_Size clauses Date: Thu, 13 Jun 2024 15:33:10 +0200 Message-ID: <20240613133338.1809385-4-poulhies@adacore.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613133338.1809385-1-poulhies@adacore.com> References: <20240613133338.1809385-1-poulhies@adacore.com> 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 Where possible, we can use high-level wrapper routines instead of the low-level Get_Attribute_Definition_Clause. Code cleanup; semantics is unaffected. gcc/ada/ * layout.adb (Layout_Type): Use high-level wrapper routine. * sem_ch13.adb (Inherit_Delayed_Rep_Aspects): Likewise. * sem_ch3.adb (Analyze_Object_Declaration): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/layout.adb | 4 ++-- gcc/ada/sem_ch13.adb | 4 +--- gcc/ada/sem_ch3.adb | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb index e43e96905e9..75635622c89 100644 --- a/gcc/ada/layout.adb +++ b/gcc/ada/layout.adb @@ -607,8 +607,8 @@ package body Layout is Error_Msg_Uint_1 := RM_Size (E); Error_Msg_F ("object size is too small, minimum allowed is ^", - Expression (Get_Attribute_Definition_Clause - (E, Attribute_Object_Size))); + Expression (Object_Size_Clause (E))); + end if; -- Adjust Esize up to RM_Size value diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 34aef434501..32b3333c157 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -14157,9 +14157,7 @@ package body Sem_Ch13 is | Aspect_Size => if not Has_Size_Clause (Typ) - and then - No (Get_Attribute_Definition_Clause - (Typ, Attribute_Object_Size)) + and then No (Object_Size_Clause (Typ)) then Set_Esize (Typ, Esize (P)); end if; diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index cbe2ef8be54..633e1367aee 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -5246,8 +5246,7 @@ package body Sem_Ch3 is E := First_Entity (Etype (Id)); while Present (E) loop if Ekind (E) = E_Entry - and then Present (Get_Attribute_Definition_Clause - (E, Attribute_Address)) + and then Present (Address_Clause (E)) then Error_Msg_Warn := SPARK_Mode /= On; Error_Msg_N -- 2.45.1