From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id E292C3857B99 for ; Fri, 4 Nov 2022 13:57:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E292C3857B99 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-wm1-x333.google.com with SMTP id m7-20020a05600c090700b003cf8a105d9eso3220339wmp.5 for ; Fri, 04 Nov 2022 06:57:33 -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=w+4IuUppzW++ArbB0OFaWw7KMmcTZnksan7qiTEDGPs=; b=B6xxbFl7YYmyepDwpBuKwVwRN/8S87QkfdnvxQTlIvYnE/zg+bSv5/ElHdNgGeQo41 adpnWkK2luEYiOB/IAVCrl06Pu7kkGB4fpiTFO2eOAyGRh1qwFoD/4tACjVHU7xSyWjG jcwa0bcR3BGaGpCsSr74Eg3vaUuay+Fy3k8ZUUtPNYUXvFah37RCr3hyoMSVq/GGeZDj gkDT4nGUe9LyYaiVS5xZUY8GtC2NZVflSvoklrTO1Keaj2KEarD286pATCHrfIU5XleV /y7ySYmCe4R1dOpY3g4a1tjvT7LUQduz7OMEIXlvxJf1aJuTfhBJOSRPa7QYP8l9k4UL 7zOw== 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=w+4IuUppzW++ArbB0OFaWw7KMmcTZnksan7qiTEDGPs=; b=bRMdawN/FU3iPOpB6KTg9RzXrE3GWX8XA24jDUrGIu04QJgjfhSLOvOrZxsoEjw5nR WtstNmchzYc6ZYNzEIi9vMNpR8TcQ/vlNjKMGDdIoEJ0L1OwD0NGy3bLQVDxt8x147Jg fz6N/96A/tme1R8QABPSKPY62VpTAnm/ls1Ns1TpTAp64zuxf8Y0U2gAdC69Cbq+pAnP yajDTeylQmVDnPmDxzZGfNWc3Wvoxjw49SrSpc5b/6nYqbLVM2W1v6NKCdtcl612sekt KDl21ApqaZmslOzeeG+b8hHrfD9zIQhgENhLrLfjHeFTMWcivavtwFhDeokQXqN0ajcQ dTXQ== X-Gm-Message-State: ACrzQf3NVpx1fp3gIcfkNOLrlvHCFURObQVOH3eV9O8BUUcUoJ6rzm01 2hkKoGwcWpW/aHZhvpHR2UwnDt4QSu6AOA== X-Google-Smtp-Source: AMsMyM6NuirEXkk2trbd5E/tue3QS3yQv0w0D8o/mXcX/psdAgViUphB5e4umCDyxI1V/ZPnj2OIUQ== X-Received: by 2002:a1c:7c03:0:b0:3cf:4969:9bab with SMTP id x3-20020a1c7c03000000b003cf49699babmr23397490wmc.176.1667570252697; Fri, 04 Nov 2022 06:57:32 -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 p10-20020a05600c1d8a00b003c6bd91caa5sm3091569wms.17.2022.11.04.06.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 06:57:32 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Fix repeated killing of private entity values Date: Fri, 4 Nov 2022 14:57:28 +0100 Message-Id: <20221104135728.86443-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=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_ASCII_DIVIDERS,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 When killing known values of assignable entities we iterated from First_Entity and then again from First_Private_Entity. This second iteration was unnecessary, because the entity chain that starts with First_Entity contains all entities, including the private ones. This is just a performance improvement; the behavior is unchanged. gcc/ada/ * sem_util.adb (Kill_Current_Values): Only iterate from First_Entity through Next_Entity. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_util.adb | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 9eeaf7cc05b..28396a4c34b 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -22287,25 +22287,6 @@ package body Sem_Util is procedure Kill_Current_Values (Last_Assignment_Only : Boolean := False) is S : Entity_Id; - procedure Kill_Current_Values_For_Entity_Chain (E : Entity_Id); - -- Clear current value for entity E and all entities chained to E - - ------------------------------------------ - -- Kill_Current_Values_For_Entity_Chain -- - ------------------------------------------ - - procedure Kill_Current_Values_For_Entity_Chain (E : Entity_Id) is - Ent : Entity_Id; - begin - Ent := E; - while Present (Ent) loop - Kill_Current_Values (Ent, Last_Assignment_Only); - Next_Entity (Ent); - end loop; - end Kill_Current_Values_For_Entity_Chain; - - -- Start of processing for Kill_Current_Values - begin -- Kill all saved checks, a special case of killing saved values @@ -22321,16 +22302,15 @@ package body Sem_Util is -- Clear current values of all entities in current scope - Kill_Current_Values_For_Entity_Chain (First_Entity (S)); - - -- If scope is a package, also clear current values of all private - -- entities in the scope. - - if Is_Package_Or_Generic_Package (S) - or else Is_Concurrent_Type (S) - then - Kill_Current_Values_For_Entity_Chain (First_Private_Entity (S)); - end if; + declare + Ent : Entity_Id; + begin + Ent := First_Entity (S); + while Present (Ent) loop + Kill_Current_Values (Ent, Last_Assignment_Only); + Next_Entity (Ent); + end loop; + end; -- If this is a not a subprogram, deal with parents -- 2.34.1