From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH 07/11] [gdb/macros] Workaround gcc PR debug/115066
Date: Tue, 21 May 2024 17:44:11 +0200 [thread overview]
Message-ID: <20240521154415.9543-7-tdevries@suse.de> (raw)
In-Reply-To: <20240521154415.9543-1-tdevries@suse.de>
When running test-case gdb.base/fission-macro.exp with gcc 14, we run into:
...
(gdb) p FIRST^M
No symbol "FIRST" in current context.^M
(gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=4: dwarf_bits=32: \
strict_dwarf=0: p FIRST
...
This is because gcc 14 is missing the fix for gcc PR debug/115066, which is
basically the dwarf-4 variant of dwarf-5 gcc PR debug/99319, for which we
already have a workaround.
Likewise, work around this problem for v4 dwarf.
Tested on x86_64-linux.
Tested test-case (and gdb.base/fission-macro-i.exp) using a current gcc trunk
build and gcc 7-14.
---
gdb/dwarf2/cu.c | 1 +
gdb/dwarf2/cu.h | 1 +
gdb/dwarf2/macro.c | 6 ++++--
gdb/dwarf2/read.c | 11 +++++++++++
gdb/dwarf2/read.h | 4 ++++
gdb/testsuite/gdb.base/fission-macro-i.exp | 4 ----
gdb/testsuite/gdb.base/fission-macro.exp | 4 ----
7 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/gdb/dwarf2/cu.c b/gdb/dwarf2/cu.c
index e51ac900ea3..9a5ee59bbcf 100644
--- a/gdb/dwarf2/cu.c
+++ b/gdb/dwarf2/cu.c
@@ -35,6 +35,7 @@ dwarf2_cu::dwarf2_cu (dwarf2_per_cu_data *per_cu,
producer_is_gxx_lt_4_6 (false),
producer_is_gcc_lt_4_3 (false),
producer_is_gcc_lt_11 (false),
+ producer_is_gcc_lt_15 (false),
producer_is_gcc_11 (false),
producer_is_icc (false),
producer_is_icc_lt_14 (false),
diff --git a/gdb/dwarf2/cu.h b/gdb/dwarf2/cu.h
index 190d395159d..875b0250e3e 100644
--- a/gdb/dwarf2/cu.h
+++ b/gdb/dwarf2/cu.h
@@ -257,6 +257,7 @@ struct dwarf2_cu
bool producer_is_gxx_lt_4_6 : 1;
bool producer_is_gcc_lt_4_3 : 1;
bool producer_is_gcc_lt_11 : 1;
+ bool producer_is_gcc_lt_15 : 1;
bool producer_is_gcc_11 : 1;
bool producer_is_icc : 1;
bool producer_is_icc_lt_14 : 1;
diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c
index fd081f3c1f9..10daca2cc54 100644
--- a/gdb/dwarf2/macro.c
+++ b/gdb/dwarf2/macro.c
@@ -481,7 +481,8 @@ dwarf_decode_macro_bytes (dwarf2_per_objfile *per_objfile,
mac_ptr++;
if (section_is_gnu && cu->dwo_unit != nullptr
- && cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu))
+ && ((cu->per_cu->version () <= 4 && producer_is_gcc_lt_15 (cu))
+ || (cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu))))
{
if (macinfo_type == DW_MACRO_define_strp)
macinfo_type = DW_MACRO_define_strx;
@@ -860,7 +861,8 @@ dwarf_decode_macros (dwarf2_per_objfile *per_objfile,
mac_ptr++;
if (section_is_gnu && cu->dwo_unit != nullptr
- && cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu))
+ && ((cu->per_cu->version () <= 4 && producer_is_gcc_lt_15 (cu))
+ || (cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu))))
{
if (macinfo_type == DW_MACRO_define_strp)
macinfo_type = DW_MACRO_define_strx;
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index e5f65ad28f2..6a489502f8b 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -7278,6 +7278,16 @@ producer_is_gcc_lt_11 (struct dwarf2_cu *cu)
return cu->producer_is_gcc_lt_11;
}
+/* See dwarf2/read.h. */
+bool
+producer_is_gcc_lt_15 (struct dwarf2_cu *cu)
+{
+ if (!cu->checked_producer)
+ check_producer (cu);
+
+ return cu->producer_is_gcc_lt_15;
+}
+
/* See dwarf2/read.h. */
bool
producer_is_clang (struct dwarf2_cu *cu)
@@ -11310,6 +11320,7 @@ check_producer (struct dwarf2_cu *cu)
cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6);
cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3);
cu->producer_is_gcc_lt_11 = major < 11;
+ cu->producer_is_gcc_lt_15 = major < 15;
cu->producer_is_gcc_11 = major == 11;
}
else if (producer_is_icc (cu->producer, &major, &minor))
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 7fca859c43d..d61985e4916 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -822,6 +822,10 @@ extern void dwarf2_get_section_info (struct objfile *,
gcc 11. */
extern bool producer_is_gcc_lt_11 (struct dwarf2_cu *cu);
+/* Return true if the producer of the inferior is gcc, and earlier than
+ gcc 15. */
+extern bool producer_is_gcc_lt_15 (struct dwarf2_cu *cu);
+
/* Return true if the producer of the inferior is clang. */
extern bool producer_is_clang (struct dwarf2_cu *cu);
diff --git a/gdb/testsuite/gdb.base/fission-macro-i.exp b/gdb/testsuite/gdb.base/fission-macro-i.exp
index 62304f9b69e..01eb8c9ea84 100644
--- a/gdb/testsuite/gdb.base/fission-macro-i.exp
+++ b/gdb/testsuite/gdb.base/fission-macro-i.exp
@@ -66,10 +66,6 @@ proc do_tests { dwarf_version dwarf_bits strict_dwarf } {
}
foreach_with_prefix dwarf_version {4 5} {
- if { $dwarf_version == 4 && [gcc_major_version] < 15 } {
- # Gcc does not contain fix for PR debug/115066.
- continue
- }
foreach_with_prefix dwarf_bits {32 64} {
foreach_with_prefix strict_dwarf {0 1} {
do_tests $dwarf_version $dwarf_bits $strict_dwarf
diff --git a/gdb/testsuite/gdb.base/fission-macro.exp b/gdb/testsuite/gdb.base/fission-macro.exp
index 9e5d5c0a0d5..2434a329b7e 100644
--- a/gdb/testsuite/gdb.base/fission-macro.exp
+++ b/gdb/testsuite/gdb.base/fission-macro.exp
@@ -67,10 +67,6 @@ proc do_tests { dwarf_version dwarf_bits strict_dwarf } {
}
foreach_with_prefix dwarf_version {4 5} {
- if { $dwarf_version == 4 && [gcc_major_version] < 15 } {
- # Gcc does not contain fix for PR debug/115066.
- continue
- }
foreach_with_prefix dwarf_bits {32 64} {
foreach_with_prefix strict_dwarf {0 1} {
do_tests $dwarf_version $dwarf_bits $strict_dwarf
--
2.35.3
next prev parent reply other threads:[~2024-05-21 15:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-21 15:44 [PATCH 01/11] [gdb/testsuite] Add gdb.base/fission-macro.exp Tom de Vries
2024-05-21 15:44 ` [PATCH 02/11] [gdb/macros] Handle 64-bit dwarf in gdb.base/fission-macro.exp Tom de Vries
2024-05-21 15:44 ` [PATCH 03/11] [gdb/testsuite] Add test-case gdb.base/fission-macro-i.exp Tom de Vries
2024-06-13 16:27 ` Tom de Vries
2024-05-21 15:44 ` [PATCH 04/11] [gdb/macros] Work around gcc PR debug/99319 Tom de Vries
2024-05-21 15:44 ` [PATCH 05/11] [gdb/macros] Work around a gcc PR fixed in gcc 9 Tom de Vries
2024-05-21 15:44 ` [PATCH 06/11] [gdb/macros] Handle v4 dwarf in gdb.base/fission-macro.exp Tom de Vries
2024-05-21 15:44 ` Tom de Vries [this message]
2024-05-21 15:44 ` [PATCH 08/11] [gdb/testsuite] Extend gdb.base/fission-macro.exp Tom de Vries
2024-05-21 15:44 ` [PATCH 09/11] [gdb/macros] Fix gdb.base/fission-macro.exp with clang Tom de Vries
2024-05-21 15:44 ` [PATCH 10/11] [gdb/testsuite] Use -g3 in gdb.base/lineinc.exp Tom de Vries
2024-05-21 15:44 ` [PATCH 11/11] [gdb/testsuite] Don't use readelf in gdb/contrib/cc-with-tweaks.sh Tom de Vries
2024-06-13 15:40 ` [PATCH 01/11] [gdb/testsuite] Add gdb.base/fission-macro.exp Tom de Vries
2024-06-17 8:16 ` Christophe Lyon
2024-06-17 8:23 ` Tom de Vries
2024-06-17 8:43 ` Christophe Lyon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240521154415.9543-7-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).