From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id 914F13861808; Tue, 26 Sep 2023 11:45:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 914F13861808 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695728751; bh=mAhnF5Tm7kSme9TE7z34pLgAX2ClTNSsyqR2g7xlk2A=; h=From:To:Subject:Date:From; b=gKElRZkLm3BzjcpNgKl/JxW/cCdX3ovu5O8ttloi3/sxr+0tiHjh+mB+PqO8q371w 86Ht5asPJn1aZy2VH08sdNcFDEJCS1QzW47ujUfUi3aV4GgJeP5327pYQxrd8fxngs Q4Cb7JWDdAXy41+K3XQYLe9UV4xS2HcLINQFcsZE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4270] ada: Fix conversions between addresses and integers X-Act-Checkin: gcc X-Git-Author: Daniel King X-Git-Refname: refs/heads/master X-Git-Oldrev: 8e8e3a00db4e24df9468dde660587d3fb8b5cfee X-Git-Newrev: 0787c56c48750156783bd5d3280579e9c68a8aa5 Message-Id: <20230926114551.914F13861808@sourceware.org> Date: Tue, 26 Sep 2023 11:45:51 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0787c56c48750156783bd5d3280579e9c68a8aa5 commit r14-4270-g0787c56c48750156783bd5d3280579e9c68a8aa5 Author: Daniel King Date: Wed Aug 23 13:00:57 2023 +0100 ada: Fix conversions between addresses and integers On CHERI targets the size of System.Address and Integer_Address (or similar) are not the same. The operations in System.Storage_Elements should be used to convert between integers and addresses. gcc/ada/ * libgnat/a-tags.adb (To_Tag): Use System.Storage_Elements for integer to address conversion. * libgnat/s-putima.adb (Put_Image_Pointer): Likewise. Diff: --- gcc/ada/libgnat/a-tags.adb | 5 ++++- gcc/ada/libgnat/s-putima.adb | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc/ada/libgnat/a-tags.adb b/gcc/ada/libgnat/a-tags.adb index 3590785aa44..1ffc78ed1e8 100644 --- a/gcc/ada/libgnat/a-tags.adb +++ b/gcc/ada/libgnat/a-tags.adb @@ -93,7 +93,10 @@ package body Ada.Tags is -- Disable warnings on possible aliasing problem function To_Tag is - new Unchecked_Conversion (Integer_Address, Tag); + new Unchecked_Conversion (System.Address, Tag); + + function To_Tag (S : Integer_Address) return Tag is + (To_Tag (To_Address (S))); function To_Dispatch_Table_Ptr is new Ada.Unchecked_Conversion (Tag, Dispatch_Table_Ptr); diff --git a/gcc/ada/libgnat/s-putima.adb b/gcc/ada/libgnat/s-putima.adb index 1d6e6085928..bcc7af2ebf5 100644 --- a/gcc/ada/libgnat/s-putima.adb +++ b/gcc/ada/libgnat/s-putima.adb @@ -32,7 +32,7 @@ with Ada.Strings.Text_Buffers.Utils; use Ada.Strings.Text_Buffers; use Ada.Strings.Text_Buffers.Utils; -with Ada.Unchecked_Conversion; +with System.Storage_Elements; use System.Storage_Elements; package body System.Put_Images is @@ -132,15 +132,13 @@ package body System.Put_Images is procedure Put_Image_Pointer (S : in out Sink'Class; X : Pointer; Type_Kind : String) is - function Cast is new Ada.Unchecked_Conversion - (System.Address, Unsigned_Address); begin if X = null then Put_UTF_8 (S, "null"); else Put_UTF_8 (S, "("); Put_UTF_8 (S, Type_Kind); - Hex.Put_Image (S, Cast (X.all'Address)); + Hex.Put_Image (S, Unsigned_Address (To_Integer (X.all'Address))); Put_UTF_8 (S, ")"); end if; end Put_Image_Pointer;