Re: [PATCH] [gdb/build] Fix static cast of virtual base

[Andrew Burgess <aburgess@redhat.com>]

Simon Marchi <simon.marchi@polymtl.ca> writes:

> On 3/11/24 06:25, Andrew Burgess wrote:
>>> This is similar to what I proposed here:
>>>
>>> https://inbox.sourceware.org/gdb-patches/24af4ea8-5426-4ce4-b1c5-12858b38a952@simark.ca/
>>>
>>> The idea is the same, to have a static_cast in the DEVELOPMENT branch.
>>> I kinda like my version better, as it factors out the static cast
>>> (notice that both branches have identical static_cast lines after your
>>> patch) and the  ifdef is just around a single assert.  Also, I'm pretty
>>> sure the nullptr check is not necessary, as both dynamic_cast and
>>> static_cast can handle it.
>> 
>> I agree yours is better.  Do you have an official patch somewhere that I
>> can add a +1 too?  If not then below is an updated version inline with
>> you proposal.  Feel free to push your version if you have it somewhere.
>
> I didn't have a proper patch ready, what you sent LGTM.  Thanks a lot
> for taking care of it.

Thanks.  I pushed this patch.

I also pushed the patch below which I spotted in the same area.

Thanks,
Andrew

---

commit 8695c3a693849bf6ebd3c6d0620f03bcc6429604
Author: Andrew Burgess <aburgess@redhat.com>
Date:   Wed Mar 6 17:48:55 2024 +0000

    gdbsupport: rename include guard in gdb-checked-static-cast.h
    
    I noticed in passing that the include guard in the file
    gdbsupport/gdb-checked-static-cast.h was wrong, it includes the word
    DYNAMIC when STATIC would be better, fixed in this commit.
    
    There should be no user visible changes after this commit.

diff --git a/gdbsupport/gdb-checked-static-cast.h b/gdbsupport/gdb-checked-static-cast.h
index 24fa7a4ba04..97843fab225 100644
--- a/gdbsupport/gdb-checked-static-cast.h
+++ b/gdbsupport/gdb-checked-static-cast.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_CHECKED_DYNAMIC_CAST_H
-#define COMMON_GDB_CHECKED_DYNAMIC_CAST_H
+#ifndef COMMON_GDB_CHECKED_STATIC_CAST_H
+#define COMMON_GDB_CHECKED_STATIC_CAST_H
 
 #include "gdbsupport/traits.h"
 
@@ -80,4 +80,4 @@ checked_static_cast (V &v)
 
 }
 
-#endif /* COMMON_GDB_CHECKED_DYNAMIC_CAST_H */
+#endif /* COMMON_GDB_CHECKED_STATIC_CAST_H */