From patchwork Mon May 22 08:51:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 97210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1308761vqo; Mon, 22 May 2023 02:12:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7d7Y+mdPcfHbMJ/jKIfCsKsbRavaOaQmkUw4LfpGmZ5EIOt8oYBPm65fnveNHUl9UG/z8U X-Received: by 2002:a17:907:78da:b0:96b:559e:7f2f with SMTP id kv26-20020a17090778da00b0096b559e7f2fmr8456313ejc.38.1684746720096; Mon, 22 May 2023 02:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684746720; cv=none; d=google.com; s=arc-20160816; b=aTdfIOVYNZHqHDTp5GpA0c5uJ2UlMJXWh6DtOM/g27Y732K9eG9rvb96rII9S9kMgs I6jFC9WRSeah/XvrIi/YXqegazaWeLmW+9pyAMi/3s+dyF2HQMeanBMAYRm/9TufRTOD 97IX6Xnx90cySCiUe/Tf+O8jxweDU+Sa6a/2wuvA7EDo3ZoMGL+1StZRehjZkdvddYKV rsb2s3E+ey989gXaRjwbWvRD1b1i55yT3Egw+u/HjUtwcqQA2APaY5E0clYYdzB2E2++ Rka8XM60MMRjKIG1UrQfsoSc9gHG1ZLZdj/O/UIw6ucFsMPFFUxD42NMpclXaW5CGrYW kUHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=G+l+N/TpzYSI68bHY1M5JbsPExR5572R8Z+4ICtZGwI=; b=jFZzK06KSpycUZnQ1jCiwvYYjx7mwGjXKb2qdsaIzqNyiWkYFe/7kaT0VNxDnZaCWR iaeLFA4UUtLz9wUKT/AZ8C/gYGQ+RlvUmNujPbc8OF2OlvwnwY5tYmbIIvbjfRHyWzUx 3gPbVtBMUjXgGFBurrng3faYP/F/DoUwmF82cnpvNwIuOdxftqPvwfcW+SWTYQEp3zo9 w0ntihtZA/adLUszWMgNS4NUD44GiOf2sn77I4jk8DRguymCY7xBRXU/mPa3oFP/saez WyzCAdDXuPLdHqRkku4hhH/K9TP+9pEwIZ/x7EZpJTsefSK2AyqKKkFhWcNwrC2zO9aa IKxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=L3BXPIFG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id v1-20020a1709060b4100b0096f5348290asi2333845ejg.67.2023.05.22.02.11.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 02:12:00 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=L3BXPIFG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 971D73857711 for ; Mon, 22 May 2023 09:01:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 971D73857711 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684746102; bh=G+l+N/TpzYSI68bHY1M5JbsPExR5572R8Z+4ICtZGwI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=L3BXPIFGJiYGVOvlUd3udXrVvlOLQc9J/cJsIVkdlrVEdVyyM8pdK8vzUMtywV75g AXTO7wszwxSjoD9SKm4G/eKw/6oXxWTZMtaGs0MQYnnhqWARXNV7vbzwjNDvvv03/7 iCp1s42nLmtcsv9e+t16cFcrQd4zXMSsswajE6TI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 30CDA3882670 for ; Mon, 22 May 2023 08:51:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 30CDA3882670 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3093d10442aso3601735f8f.1 for ; Mon, 22 May 2023 01:51:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684745515; x=1687337515; 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=G+l+N/TpzYSI68bHY1M5JbsPExR5572R8Z+4ICtZGwI=; b=YvTPA1gpNFdxLfVCW9WURZNCPFiyfxlLhfhs+CR5bxiqwmZ/TmwXMd+6Zeo0jadDOh YiORFZUHSmYbXpTa/yHR9HomI+z4wJ2ZBUI7Y+OR9etNN0VLeCRFwoPtbtGRNhYwP6to kCcW6M8QDZQ0h/cNnY/x+5jS+xOtxvmusv5i0tYddoe0z23/vpGyg6dZdOA6vHPADfGe B9vK1bc0nrNV1UilZ0jsC+imC5vj27wwF7A31e3cf1d7AMQ6kYUb+zcORvm1Xe1vTYqf LqkELjwYjKBHPnCaHdGbn90JCfWhtjBmw5tU/MZU6aQ7W4CqouZpivj/nmZaNV5GI2zS vDNw== X-Gm-Message-State: AC+VfDxrPsaX4WdLcy9KiEQmFF3BZO8ssfuSLyQXrN1K6x+wby8WjS51 32TtLAcLLRL5qLt3Uhc9gx0YnPaUi666X5cU2pi/8w== X-Received: by 2002:a5d:4606:0:b0:306:29c8:23f7 with SMTP id t6-20020a5d4606000000b0030629c823f7mr6345397wrq.29.1684745514791; Mon, 22 May 2023 01:51:54 -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 f17-20020a7bcc11000000b003f42ceb3bf4sm7563063wmh.32.2023.05.22.01.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 01:51:54 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Avoid repeated calls when looking for first/last slocs of a node Date: Mon, 22 May 2023 10:51:52 +0200 Message-Id: <20230522085152.1727635-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766584976763893273?= X-GMAIL-MSGID: =?utf-8?q?1766584976763893273?= From: Piotr Trojanek gcc/ada/ * errout.adb (First_Loc): Avoid repeated calls. (Last_Loc): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/errout.adb | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb index 49281fdb05f..a82aff5266b 100644 --- a/gcc/ada/errout.adb +++ b/gcc/ada/errout.adb @@ -1845,11 +1845,12 @@ package body Errout is ---------------- function First_Sloc (N : Node_Id) return Source_Ptr is - SI : constant Source_File_Index := Source_Index (Get_Source_Unit (N)); - SF : constant Source_Ptr := Source_First (SI); - SL : constant Source_Ptr := Source_Last (SI); - F : Node_Id; - S : Source_Ptr; + SI : constant Source_File_Index := Source_Index (Get_Source_Unit (N)); + SF : constant Source_Ptr := Source_First (SI); + SL : constant Source_Ptr := Source_Last (SI); + Src : constant Source_Buffer_Ptr := Source_Text (SI); + F : Node_Id; + S : Source_Ptr; begin F := First_Node (N); @@ -1876,11 +1877,11 @@ package body Errout is Search_Loop : for K in 1 .. 12 loop exit Search_Loop when S = SF; - if Source_Text (SI) (S - 1) = '(' then + if Src (S - 1) = '(' then S := S - 1; exit Search_Loop; - elsif Source_Text (SI) (S - 1) <= ' ' then + elsif Src (S - 1) <= ' ' then S := S - 1; else @@ -1963,11 +1964,12 @@ package body Errout is --------------- function Last_Sloc (N : Node_Id) return Source_Ptr is - SI : constant Source_File_Index := Source_Index (Get_Source_Unit (N)); - SF : constant Source_Ptr := Source_First (SI); - SL : constant Source_Ptr := Source_Last (SI); - F : Node_Id; - S : Source_Ptr; + SI : constant Source_File_Index := Source_Index (Get_Source_Unit (N)); + SF : constant Source_Ptr := Source_First (SI); + SL : constant Source_Ptr := Source_Last (SI); + Src : constant Source_Buffer_Ptr := Source_Text (SI); + F : Node_Id; + S : Source_Ptr; begin F := Last_Node (N); @@ -1980,7 +1982,7 @@ package body Errout is -- Skip past an identifier while S in SF .. SL - 1 - and then Source_Text (SI) (S + 1) + and then Src (S + 1) in '0' .. '9' | 'a' .. 'z' | 'A' .. 'Z' | '.' | '_' loop @@ -2000,11 +2002,11 @@ package body Errout is Search_Loop : for K in 1 .. 12 loop exit Node_Loop when S = SL; - if Source_Text (SI) (S + 1) = ')' then + if Src (S + 1) = ')' then S := S + 1; exit Search_Loop; - elsif Source_Text (SI) (S + 1) <= ' ' then + elsif Src (S + 1) <= ' ' then S := S + 1; else @@ -2021,7 +2023,7 @@ package body Errout is -- Remove any trailing space while S in SF + 1 .. SL - and then Source_Text (SI) (S) = ' ' + and then Src (S) = ' ' loop S := S - 1; end loop;