From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id 9F160385EC44 for ; Tue, 7 May 2024 08:00:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9F160385EC44 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 9F160385EC44 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::22c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715068855; cv=none; b=qXSQfxV7jlNen0MlrQzoGfo43BR6PKpRf4ps3whDrhjtJaqOG4K+7A1GQfn/R9iqBAonW9pJ7UW5SVjSeqtwZ6TmfW09Np9Ra8B9TizdAiG4FzHVkM0e1Gt3rdXdgtCx0WC//tBB3coD0ivejWz46CG3J6tiild1do1kNoBPUJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715068855; c=relaxed/simple; bh=5VyCataPbmigpzen6N5R3oKG/dJEgKX0sxtZ0S2GBVM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=l6qEgRmIFw7aAztLSjuFiORn5vH4mXA6FS8a2WX6AvbRrH8v8bo3+lXnfPhYtjwJLh6xIWQDLnjnOoXMxCGlp6pzIcgmJX8TbWpCCIVpJPSBaWFMwYlXbcYekH5boY7s4PL2Sw9l/xfyXlbWWOrXQm7zh2Lx4SnyOhFvogwWolU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2e0a34b2899so39802711fa.3 for ; Tue, 07 May 2024 01:00:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715068833; x=1715673633; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pK/YA7jZcg5NjM5LPZfDEUPH2D/1yx4EAXd1sbNwu5k=; b=ino79PUGrJUAUKVAkQlA3sTY2U/qV8SLQROrzKFWDpsyzUXO0drxYKeONMpgTWnEi7 Fur0EfFkz6X8hflxFUP8BrwBKzKJTAuqTlSViuDG7NKKT64Dy4Y0IEXVF3hs/iy/MYnU JvSmJIN8dGJXQMF/zb9sCt109tQFhANtVoppvrQJ9WSh2ZEFjQkW0zRMRNy3HgtIbOaD XdsW9I+EH8bAM16DOcRzOE7wKK22L8DsFgi2GqSg18FNgkQI8cNCjhdWQJ3jmHV4rFgt QipXh3sx/pdxzeviddKZ3NvbE93w5u9cPcUs5oQCyvZlGJJznER5JLGElqtKin/adQEz YKyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715068833; x=1715673633; 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=pK/YA7jZcg5NjM5LPZfDEUPH2D/1yx4EAXd1sbNwu5k=; b=fN2UVuuv6siBoSfQy6wQWEbx5/l1ISVzRgQkfxau+AajMfAWSK9wdiUVFvSpDF/++U wI2SJ65Tlsr8j1vZfV/mdJaVHjJ0gbNmwE+it53iTekXsx7HqIcXOpajGwhhV69F/f3z FhadCLjf/KR1GclhE2+I8sVlLIPD3ZnzQNJc+fpkkUK85X++OTTGo1FLlIhL6QFP6xl5 t5tlhkVM0HR3BxlU7Iyqzx7IMz1Opw9Wj8puBVe7XSzwXukKDO9JC0+WJuAATBvqfgbQ o6RhI6QdkOejR3dbPpJ0x0qbQIdls/sNf8CQV/o/Ww3QHV5NvIxRz8jgTdNaZs6T3wXq V8kw== X-Gm-Message-State: AOJu0YxdwiXj5+L2atsythhtO3VOXBidQqhPi/JHZRmmFL2whqjwMgdl N41yP6ndUdmu8VcArr7yysu/Rhcn3/HmPFS5hAiYWeraFcqVx/BrxRisT7XTJPxoHwS3F7ExhKc = X-Google-Smtp-Source: AGHT+IEPL75g5pxbBf3qqQcaY/ozcJ4XNAD0W3ze6Fii2w+MCPNU8LhX1NdKvTSBzWTLbxtewDnKQw== X-Received: by 2002:a2e:3510:0:b0:2dc:e3da:8025 with SMTP id z16-20020a2e3510000000b002dce3da8025mr10185791ljz.36.1715068832493; Tue, 07 May 2024 01:00:32 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:11a6:1c9d:5099:b1e8]) by smtp.gmail.com with ESMTPSA id f8-20020a05600c154800b00418f99170f2sm18711346wmg.32.2024.05.07.01.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 May 2024 01:00:32 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Reduce scope in the analysis of access attributes Date: Tue, 7 May 2024 10:00:31 +0200 Message-ID: <20240507080031.37807-1-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 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 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 Code cleanup; semantics is unaffected. gcc/ada/ * sem_attr.adb (Analyze_Access_Attribute): Move code to IF branch where its result is used. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_attr.adb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index c17f67356ef..6140cc0c0d6 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -982,15 +982,16 @@ package body Sem_Attr is if Is_Entity_Name (P) then Typ := Entity (P); - -- The reference may appear in an aggregate that has been expanded - -- into a loop. Locate scope of type definition, if any. + if Is_Type (Typ) then - Scop := Current_Scope; - while Ekind (Scop) = E_Loop loop - Scop := Scope (Scop); - end loop; + -- The reference may appear in an aggregate that has been + -- expanded into a loop. Locate scope of type definition, + -- if any. - if Is_Type (Typ) then + Scop := Current_Scope; + while Ekind (Scop) = E_Loop loop + Scop := Scope (Scop); + end loop; -- OK if we are within the scope of a limited type -- let's mark the component as having per object constraint -- 2.43.2