From patchwork Thu Aug 3 12:08:44 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: 130534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1101943vqx; Thu, 3 Aug 2023 05:10:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlHwLAVYUYQ5M6oN5Z8fnZBDjVqmPKyiPN10ihx0nayhwXWc7uW8TSBt9KjK0YI9AiX73t1t X-Received: by 2002:a17:906:9bcb:b0:99c:444c:e4bb with SMTP id de11-20020a1709069bcb00b0099c444ce4bbmr4149973ejc.42.1691064623767; Thu, 03 Aug 2023 05:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691064623; cv=none; d=google.com; s=arc-20160816; b=ydjHlf0VSEkN96E6/AOj/EysXZg+oAd/mN9m/6eiv+b/7LBCCaEZrNue879aKd2jnO woPlh7ChE/e7cB4BtNhNUJtWFav2rERVGZA93HLbA9MeB8bFS0Oqjfpv4FKvkHA+Mmw5 DJ2vmxb7xgib+Kki1J8UO3esbLElNso6UyV8pO9tBKWPSxX1w0SmS4SH+792J5mB0w+L Hk10r3W5hjN1dxS2QHYRnies2E5ElVKM1MRRoRV4e8vS5K+YO4/lAv1rVT7mLePJ8eF5 GzT2yTHx8F9yXEFfbKlA1yWDBx38e3x8Bh6Y4GZ/7JZmN3+u0jxRrgMcAEr4N2qjwNBW yf8Q== 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=He1kCnCiugAXs8bkbRVsuh4gyVMuiZFCYC7GYjE4rn0=; fh=/3KX5nH+f3PGIzCwnuf//1E+cbLgxv/xavy4NboKqC4=; b=pqFY1IgN5VNoSpRwH0nWKEi6wcEZzQ9VKAalwaZb5D2hoNSGWVMsMZwdwE7veWXzZ1 mCHvE472LKqvLGmQdzZocP2VJ7KdHlgg5yofsk6tVpz4Cwsu2uwFXFffjHAfKruGM73x BMXVyAEJJd8dzo+KePwvbnp93R0HIFJoNe0/qfYSqj2C/VkL73fBBvifEWTfOI+SFKgr qAxpGp83lGmhUdcQ/bf1CieV5IE5DwRy0uBQ/bT1eDhnEcKQ27+xdKFD3M4KXNEdy/o+ IASbiRk3Q3ABw+NVJ+hPhvFLgDdjU+HWPRtYNHEXGIFu6DYjztqaKXXgK/EH9BnhXUdj CjDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FmFVT7+L; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id c22-20020a17090603d600b00992b8854f48si9763319eja.556.2023.08.03.05.10.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 05:10:23 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FmFVT7+L; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 EA3DB3857357 for ; Thu, 3 Aug 2023 12:09:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA3DB3857357 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1691064596; bh=He1kCnCiugAXs8bkbRVsuh4gyVMuiZFCYC7GYjE4rn0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=FmFVT7+LF92HEI3NqkKMl+Jl30BVO/+FRH+vF6IYOFz8AZMb1vuLl1+Rceki86lso 21PG7KSnKtYqs3IGtImHDK1fQobJBfmlX9v0iBTZALdL9IPb6R/w0OluzRDiDuj8Dr hJWCO4hAdzhaLwOUGWZ0A6bnCLoXgggQlkg0kp1M= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id EA5C7385703A for ; Thu, 3 Aug 2023 12:09:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EA5C7385703A Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-31759e6a4a1so705989f8f.3 for ; Thu, 03 Aug 2023 05:09:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691064543; x=1691669343; 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=He1kCnCiugAXs8bkbRVsuh4gyVMuiZFCYC7GYjE4rn0=; b=Pb0d9VGx+DWgZwx4snU2EvDJZAG7b+rQkXMxl6L9E63Km51wIh15J8R5xBf1/D87nC Q4g5paV9Ju3wG1D+vvJwD/P8sfkfglEoD7QzSSVyKPaIvWE7wU8LujLUV+awoGjNMYgK M/q3L4/bl0fGm2xQX6GZDTtdYrlDfNvCfX+xqPn/Bs7+MpxaYhnLIjBYKI+Elfo7iEwJ QAT1TIhNfXbNTtOC62MleLcxd59xEgiVswZ1+8xvUCfIuEF+yUc2cFKSYAMZJ67YocWj qpb4+3DcduaRPu8QOFJvafZnBILNqa9MGIPQgHyxp9G+snVa1z/uM/Lj9iijZN16EWtF jfbw== X-Gm-Message-State: ABy/qLbA8nj67YyAtEqvXXWzETHU0aIy4pFE7JGSjjSXQ/wIN9lBYT5b bwoKvMDomxfLdMXV8H2UXRsdjMZh5oAIITuRBza0og== X-Received: by 2002:a5d:6783:0:b0:317:6965:ef4d with SMTP id v3-20020a5d6783000000b003176965ef4dmr6724349wru.56.1691064543518; Thu, 03 Aug 2023 05:09:03 -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 z7-20020a5d4407000000b0031766e99429sm21599165wrq.115.2023.08.03.05.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 05:09:02 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Adjust again address arithmetics in System.Dwarf_Lines Date: Thu, 3 Aug 2023 14:08:44 +0200 Message-Id: <20230803120844.2526382-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 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 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: INBOX X-GMAIL-THRID: 1773209779194314125 X-GMAIL-MSGID: 1773209779194314125 From: Eric Botcazou Using the operator of System.Storage_Elements has introduced a range check that may be tripped on, so this removes the intermediate conversion to the Storage_Count subtype that is responsible for it. gcc/ada/ * libgnat/s-dwalin.adb ("-"): New subtraction operator. (Enable_Cache): Use it to compute the offset. (Symbolic_Address): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnat/s-dwalin.adb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ada/libgnat/s-dwalin.adb b/gcc/ada/libgnat/s-dwalin.adb index d35d03a8a2f..405b5d32e24 100644 --- a/gcc/ada/libgnat/s-dwalin.adb +++ b/gcc/ada/libgnat/s-dwalin.adb @@ -46,6 +46,10 @@ package body System.Dwarf_Lines is subtype Offset is Object_Reader.Offset; + function "-" (Left, Right : Address) return uint32; + pragma Import (Intrinsic, "-"); + -- Return the difference between two addresses as an unsigned offset + function Get_Load_Displacement (C : Dwarf_Context) return Storage_Offset; -- Return the displacement between the load address present in the binary -- and the run-time address at which it is loaded (i.e. non-zero for PIE). @@ -1542,7 +1546,7 @@ package body System.Dwarf_Lines is exit when Ar_Start = Null_Address and Ar_Len = 0; Len := uint32 (Ar_Len); - Start := uint32 (Storage_Count'(Ar_Start - C.Low)); + Start := uint32'(Ar_Start - C.Low); -- Search START in the array @@ -1762,7 +1766,7 @@ package body System.Dwarf_Lines is if C.Cache /= null then declare - Off : constant uint32 := uint32 (Storage_Count'(Addr - C.Low)); + Off : constant uint32 := uint32'(Addr - C.Low); First, Last, Mid : Natural; begin