[gdb/build] Workaround gcc PR113599

Since gcc commit d3f48f68227 ("c++: non-dependent .* operand folding
[PR112427]"), with gdb we run into PR gcc/113599 [1], a wrong-code bug, as
reported in PR build/31281.

Work around this by flipping inherit order:
...
-class thread_info : public refcounted_object,
-		    public intrusive_list_node<thread_info>
+class thread_info : public intrusive_list_node<thread_info>,
+		    public refcounted_object
...

An argument could be made that this isn't necessary, because this occurred in
an unreleased gcc version.

However, I think it could be useful when bisecting gcc for other problems in
building gdb.  Having this workaround means the bisect won't reintroduce the
problem.  Furthermore, the workaround is harmless.

Tested on Fedora rawhide x86_64.

Approved-By: Tom Tromey <tom@tromey.com>

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31281

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113599
This commit is contained in:
Tom de Vries 2024-01-25 16:31:47 +01:00
parent 7ff4111cde
commit 2ec7980408

View File

@ -244,10 +244,11 @@ using private_thread_info_up = std::unique_ptr<private_thread_info>;
strong reference, and is thus not accounted for in the thread's
refcount.
The intrusive_list_node base links threads in a per-inferior list. */
The intrusive_list_node base links threads in a per-inferior list.
We place it first in the inherit order to work around PR gcc/113599. */
class thread_info : public refcounted_object,
public intrusive_list_node<thread_info>
class thread_info : public intrusive_list_node<thread_info>,
public refcounted_object
{
public:
explicit thread_info (inferior *inf, ptid_t ptid);