[binutils-gdb] Fix C++ cast of derived class to base class

[Tom Tromey <tromey@sourceware.org>]

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

commit 2390419d1cb72882110538e01e5586372df19657
Author: Tom Tromey <tom@tromey.com>
Date:   Sat Apr 2 09:54:40 2022 -0600

    Fix C++ cast of derived class to base class
    
    PR c++/28907 points out that casting from a derived class to a base
    class fails in some situations.  The problem turned out to be a
    missing use of value_embedded_offset.  One peculiarity here is that,
    if you managed to construct a pointer-to-derived with an embedded
    offset of 0, the cast would work -- for example, one of the two new
    tests here passes without the patch.
    
    This embedded offset stuff is an endless source of bugs.  I wonder if
    it's possible to get rid of it somehow.
    
    Regression tested on x86-64 Fedora 34.
    
    Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28907

Diff:
---
 gdb/testsuite/gdb.cp/casts.cc  | 20 ++++++++++++++++++++
 gdb/testsuite/gdb.cp/casts.exp |  6 ++++++
 gdb/valops.c                   |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.cp/casts.cc b/gdb/testsuite/gdb.cp/casts.cc
index 543db896d3d..ea4dc961793 100644
--- a/gdb/testsuite/gdb.cp/casts.cc
+++ b/gdb/testsuite/gdb.cp/casts.cc
@@ -34,6 +34,20 @@ struct DoublyDerived : public VirtuallyDerived,
 {
 };
 
+struct Left
+{
+  int left;
+};
+
+struct Right
+{
+  int right;
+};
+
+struct LeftRight : public Left, public Right
+{
+};
+
 int
 main (int argc, char **argv)
 {
@@ -48,5 +62,11 @@ main (int argc, char **argv)
   Alpha *ad = &derived;
   Alpha *add = &doublyderived;
 
+  LeftRight gd;
+  gd.left = 23;
+  gd.right = 27;
+  unsigned long long gd_value = (unsigned long long) &gd;
+  unsigned long long r_value = (unsigned long long) (Right *) &gd;
+
   return 0;  /* breakpoint spot: casts.exp: 1 */
 }
diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
index cda870f77a4..5d0a52401a8 100644
--- a/gdb/testsuite/gdb.cp/casts.exp
+++ b/gdb/testsuite/gdb.cp/casts.exp
@@ -174,6 +174,12 @@ gdb_test "print dynamic_cast<Gamma *> (add)" \
     " = \\(Gamma \\*\\) $nonzero_hex" \
     "dynamic_cast to sibling"
 
+gdb_test "print (unsigned long long) &gd == gd_value" " = true"
+gdb_test "print (unsigned long long) (LeftRight *) (Right *) &gd == gd_value" \
+    " = true"
+gdb_test "print (unsigned long long) (LeftRight *) (Right *) r_value == gd_value" \
+    " = true"
+
 if {[prepare_for_testing "failed to prepare" ${testfile}03 $srcfile2 \
 			 {debug c++ additional_flags=-std=c++03}]} {
     return -1
diff --git a/gdb/valops.c b/gdb/valops.c
index 42a1213b0c5..e84cabf8f14 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -274,7 +274,7 @@ value_cast_structs (struct type *type, struct value *v2)
       if (v)
 	{
 	  /* Downcasting is possible (t1 is superclass of v2).  */
-	  CORE_ADDR addr2 = value_address (v2);
+	  CORE_ADDR addr2 = value_address (v2) + value_embedded_offset (v2);
 
 	  addr2 -= value_address (v) + value_embedded_offset (v);
 	  return value_at (type, addr2);