[binutils-gdb] [gdb/testsuite] Fix gdb.cp/casts.exp with -m32

[binutils-gdb] [gdb/testsuite] Fix gdb.cp/casts.exp with -m32

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a1aaf801d5f0989ea0857dfd896830570603b523

commit a1aaf801d5f0989ea0857dfd896830570603b523
Author: Tom de Vries <tdevries@suse.de>
Date:   Sun May 8 19:38:13 2022 +0200

    [gdb/testsuite] Fix gdb.cp/casts.exp with -m32
    
    When running test-case gdb.cp/casts.exp with target board unix/-m32, I run
    into:
    ...
    (gdb) print (unsigned long long) &gd == gd_value^M
    $31 = false^M
    (gdb) FAIL: gdb.cp/casts.exp: print (unsigned long long) &gd == gd_value
    ...
    
    With some additional printing, we can see in more detail why the comparison
    fails:
    ...
    (gdb) print /x &gd^M
    $31 = 0xffffc5c8^M
    (gdb) PASS: gdb.cp/casts.exp: print /x &gd
    print /x (unsigned long long)&gd^M
    $32 = 0xffffc5c8^M
    (gdb) PASS: gdb.cp/casts.exp: print /x (unsigned long long)&gd
    print /x gd_value^M
    $33 = 0xffffffffffffc5c8^M
    (gdb) PASS: gdb.cp/casts.exp: print /x gd_value
    print (unsigned long long) &gd == gd_value^M
    $34 = false^M
    (gdb) FAIL: gdb.cp/casts.exp: print (unsigned long long) &gd == gd_value
    ...
    
    The gd_value is set by this assignment:
    ...
      unsigned long long gd_value = (unsigned long long) &gd;
    ...
    
    The problem here is directly casting from a pointer to a non-pointer-sized
    integer.
    
    Fix this by adding an intermediate cast to std::uintptr_t.
    
    Tested on x86_64-linux with native and target board unix/-m32.

Diff:
---
 gdb/testsuite/gdb.cp/casts.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.cp/casts.cc b/gdb/testsuite/gdb.cp/casts.cc
index ea4dc961793..f64d13c26df 100644
--- a/gdb/testsuite/gdb.cp/casts.cc
+++ b/gdb/testsuite/gdb.cp/casts.cc
@@ -1,3 +1,5 @@
+#include <cstdint>
+
 struct A
 {
   int a;
@@ -65,7 +67,7 @@ main (int argc, char **argv)
   LeftRight gd;
   gd.left = 23;
   gd.right = 27;
-  unsigned long long gd_value = (unsigned long long) &gd;
+  unsigned long long gd_value = (unsigned long long) (std::uintptr_t)&gd;
   unsigned long long r_value = (unsigned long long) (Right *) &gd;
 
   return 0;  /* breakpoint spot: casts.exp: 1 */