From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 16E06385829A for ; Fri, 4 Nov 2022 13:58:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 16E06385829A 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-wr1-x433.google.com with SMTP id l14so7198865wrw.2 for ; Fri, 04 Nov 2022 06:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mhK4olquGCNDNDrBRzz+G5WWrEFs7DKqFAEfSDy1XIo=; b=Ga/gqER7IJYvcWB5tMhvd/YhAk9KVGPBcwxOSZ72VUCpZ6eGi8xQBabYDjkZ6gjgdB 75mKYDZjPVwfEfUu0X8ktQ1FLv0JWs6xtZfscUFQyAYCujHNFobmS2YAJz1YItg5Q/ps TXdDTnbvUUZ2jrewzEtKd4eMTwT62xHlplWIgY6Myv9elUrxD4wSLHYbNQwFSjmz48mz iYKjjbnI3EM2pd1Xt16rnxEdFYi/RLHaYecAuTloFSqOTRCZ77Vkc63V1qixiWXnqQ5d umwns0F3IrllIAFRpR9LGCFDDknkOmIC85+fpTa22Ke3POLIOXWVh9dmZpVYcg9+WNBA NJ9w== 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=mhK4olquGCNDNDrBRzz+G5WWrEFs7DKqFAEfSDy1XIo=; b=gJYjZAMuuACeNvX+ZPfACocuqB/7K3zxyGFsvvyMx9JZjOHO4uUDUkbbthpRqT2Ora 5r6zGlgZ3HlKIAEQ6yqWyPCXSvY9WXPUruoiDwlQCg1dOEpbOFFWdPjSgNsPkC8arExX hTdW7Hi6wAKTCrsp1mgxjTT1/2vq+GhRbYGqix87Ivet1KWk5JiEiAlg7EU9dslLYAy7 mXTXgsJZYidXzZpKgsPILu1nTpwIAPyqh5luJvUK7nkXLj3+95rhFeIZB5u7/bp5D5Sa CZM4rj1+9DI48+wRJIeW1ODnNSvnm8vo2i5w1LX7x/NJR+mndUG8Hm6MCUwJm4yJ1wM4 pNmA== X-Gm-Message-State: ACrzQf0lvEYsdbN8XkfdFiD291MhluoyM9zBuAipxBAvE+eL0Kr8taDK e1HZYrYAurPtH2GSB6DOAoeR4kH6EnwS6A== X-Google-Smtp-Source: AMsMyM4gZ8OgRM9TRowvkmAGNC7FeYHnBXuvsILvWPKGscjUXMBuEDc6g8ceRKYkN3q3aJoBLIZGTg== X-Received: by 2002:a5d:5233:0:b0:236:b893:9d81 with SMTP id i19-20020a5d5233000000b00236b8939d81mr20650351wra.503.1667570299897; Fri, 04 Nov 2022 06:58:19 -0700 (PDT) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id l4-20020a05600c1d0400b003c6c3fb3cf6sm3413692wms.18.2022.11.04.06.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 06:58:19 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Remove redundant calls in handling of aspect specifications Date: Fri, 4 Nov 2022 14:58:15 +0100 Message-Id: <20221104135815.86869-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 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 Routine Set_Aspect_Specifications sets the Has_Aspect flag, so there is no need to set this flag again afterwards. Code cleanup; semantics is unaffected. gcc/ada/ * aspects.adb (Relocate_Aspect): Remove call to Set_Has_Aspects. * sem_ch12.adb (Analyze_Formal_Package_Declaration): Likewise. * sem_util.adb (Copy_Ghost_Aspect, Copy_SPARK_Mode_Aspect): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/aspects.adb | 1 - gcc/ada/sem_ch12.adb | 1 - gcc/ada/sem_util.adb | 2 -- 3 files changed, 4 deletions(-) diff --git a/gcc/ada/aspects.adb b/gcc/ada/aspects.adb index 3471a81f176..81c9c284048 100644 --- a/gcc/ada/aspects.adb +++ b/gcc/ada/aspects.adb @@ -373,7 +373,6 @@ package body Aspects is else Asps := New_List; Set_Aspect_Specifications (To, Asps); - Set_Has_Aspects (To); end if; -- Remove the aspect from its original owner and relocate it to node diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 6781e5ee5b6..0b7b7c904d3 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -3121,7 +3121,6 @@ package body Sem_Ch12 is if Present (Aspect_Specifications (Gen_Decl)) then if No (Aspect_Specifications (N)) then Set_Aspect_Specifications (N, New_List); - Set_Has_Aspects (N); end if; declare diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 536d5fadefb..80d07eb0023 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -7049,7 +7049,6 @@ package body Sem_Util is if Present (Asp) then Set_Aspect_Specifications (To, New_List (New_Copy_Tree (Asp))); - Set_Has_Aspects (To, True); end if; end if; end Copy_Ghost_Aspect; @@ -7101,7 +7100,6 @@ package body Sem_Util is if Present (Asp) then Set_Aspect_Specifications (To, New_List (New_Copy_Tree (Asp))); - Set_Has_Aspects (To, True); end if; end if; end Copy_SPARK_Mode_Aspect; -- 2.34.1