From 1804d2ae908b26fe4e3d3a38646c7d6ffa733d92 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 24 Jan 2024 10:45:40 +0000 Subject: gentoo auto-resync : 24:01:2024 - 10:45:40 --- .../files/gdb-14.1-fix-dll-export-forwarding.patch | 60 ++++++++++++ .../gdb/files/gdb-14.1-fix-list-segfault.patch | 101 +++++++++++++++++++ .../gdb-14.1-fix-print-global-variable-stubs.patch | 109 +++++++++++++++++++++ 3 files changed, 270 insertions(+) create mode 100644 dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch create mode 100644 dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch create mode 100644 dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch (limited to 'dev-debug/gdb/files') diff --git a/dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch b/dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch new file mode 100644 index 000000000000..8c2a49f8042f --- /dev/null +++ b/dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch @@ -0,0 +1,60 @@ +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31112 + +From https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=43a608adb04251be8999304cf724f55b2d840ac3 +From: Hannes Domani +Date: Wed, 6 Dec 2023 20:52:06 +0100 +Subject: [PATCH] Fix DLL export forwarding + +I noticed it when I was trying to set a breakpoint at ExitProcess: +``` +(gdb) b ExitProcess +Breakpoint 1 at 0x14001fdd0 +(gdb) r +Starting program: C:\qiewer\heob\heob64.exe +Warning: +Cannot insert breakpoint 1. +Cannot access memory at address 0x3dbf4120 +Cannot insert breakpoint 1. +Cannot access memory at address 0x77644120 +``` + +The problem doesn't exist in gdb 13.2, and the difference can easily be +seen when printing ExitProcess. +gdb 14.1: +``` +(gdb) p ExitProcess +$1 = {} 0x77644120 +``` +gdb 13.2: +``` +(gdb) p ExitProcess +$1 = {} 0x77734120 +``` + +The new behavior started with 9675da25357c7a3f472731ddc6eb3becc65b469a, +where VMA was then calculated relative to FORWARD_DLL_NAME, while it was +relative to DLL_NAME before. + +Fixed by calculating VMA relative to DLL_NAME again. + +Bug: https://sourceware.org/PR31112 +Approved-By: Tom Tromey + +(cherry picked from commit 2574cd903dd84e7081506e24c2e232ecda11a736) +--- a/gdb/coff-pe-read.c ++++ b/gdb/coff-pe-read.c +@@ -210,7 +210,10 @@ add_pe_forwarded_sym (minimal_symbol_reader &reader, + " \"%s\" in dll \"%s\", pointing to \"%s\"\n"), + sym_name, dll_name, forward_qualified_name.c_str ()); + +- unrelocated_addr vma = msymbol.minsym->unrelocated_address (); ++ /* Calculate VMA as if it were relative to DLL_NAME/OBJFILE, even though ++ it actually points inside another dll (FORWARD_DLL_NAME). */ ++ unrelocated_addr vma = unrelocated_addr (msymbol.value_address () ++ - objfile->text_section_offset ()); + msymtype = msymbol.minsym->type (); + section = msymbol.minsym->section_index (); + +-- +2.39.3 + diff --git a/dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch b/dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch new file mode 100644 index 000000000000..76557b5a7e00 --- /dev/null +++ b/dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch @@ -0,0 +1,101 @@ +Bug: https://bugs.gentoo.org/922336 +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31256 + +From https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0068bd6fb3579dd8df7561e038cb3fe27f122b0e +From: Guinevere Larsen +To: gdb-patches@sourceware.org +Cc: Guinevere Larsen +Subject: [PATCH] gdb: fix "list ." related crash +Date: Tue, 23 Jan 2024 11:50:43 +0100 + +When a user attempts to use the "list ." command with an inferior that +doesn't have debug symbols, GDB would crash. This was reported as PR +gdb/31256. + +The crash would happen when attempting to get the current symtab_and_line +for the stop location, because the symtab would return a null pointer +and we'd attempt to dereference it to print the line. + +This commit fixes that by checking for an empty symtab and erroring out +of the function if it happens. + +Bug: https://sourceware.org/PR31256 +--- a/gdb/cli/cli-cmds.c ++++ b/gdb/cli/cli-cmds.c +@@ -1291,6 +1291,8 @@ list_command (const char *arg, int from_tty) + set_default_source_symtab_and_line (); + cursal = get_current_source_symtab_and_line (); + } ++ if (cursal.symtab == nullptr) ++ error (_("No debug information available to print source lines.")); + list_around_line (arg, cursal); + /* Set the repeat args so just pressing "enter" after using "list ." + will print the following lines instead of the same lines again. */ +--- /dev/null ++++ b/gdb/testsuite/gdb.base/list-nodebug.c +@@ -0,0 +1,21 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2024 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++int main () ++{ ++ return 0; ++} +--- /dev/null ++++ b/gdb/testsuite/gdb.base/list-nodebug.exp +@@ -0,0 +1,37 @@ ++# Copyright 2024 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# Test that using the command "list" in a file with no debug information ++# will not crash GDB and will give reasonable output. ++ ++standard_testfile .c ++ ++if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ ++ {nodebug}]} { ++ return -1 ++} ++ ++if {![runto_main]} { ++ untested "couldn't run to main" ++ return ++} ++ ++# Check that GDB doesn't crash when we use list . on an inferior with ++# no debug information ++gdb_test "list ." "No debug.*" "first 'list .'" ++# This should be called twice because the first list invocation since ++# printing a frame may take a different codepath, which wouldn't ++# trigger the crash. ++gdb_test "list ." "No debug.*" "second 'list .'" +-- +2.43.0 + + diff --git a/dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch b/dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch new file mode 100644 index 000000000000..ff0ff7bfb0c3 --- /dev/null +++ b/dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch @@ -0,0 +1,109 @@ +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31128 + +From https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bc23ea51f8a83e9524dfb553baa8baacb29e68a9 +From: Hannes Domani +Date: Fri, 8 Dec 2023 19:06:14 +0100 +Subject: [PATCH] Fix printing of global variable stubs if no inferior is + running + +Since 3c45e9f915ae4aeab7312d6fc55a947859057572 gdb crashes when trying +to print a global variable stub without a running inferior, because of +a missing nullptr-check (the block_scope function took care of that +check before it was converted to a method). + +With this check it works again: +``` +(gdb) print s +$1 = +``` + +Bug: https://sourceware.org/PR31128 +Approved-By: Tom Tromey +(cherry picked from commit 576745e26c0ec76a53ba45b20af464628a50b3e4) +--- a/gdb/cp-namespace.c ++++ b/gdb/cp-namespace.c +@@ -1026,7 +1026,11 @@ cp_lookup_transparent_type (const char *name) + + /* If that doesn't work and we're within a namespace, look there + instead. */ +- scope = get_selected_block (0)->scope (); ++ const block *block = get_selected_block (0); ++ if (block == nullptr) ++ return nullptr; ++ ++ scope = block->scope (); + + if (scope[0] == '\0') + return NULL; +--- /dev/null ++++ b/gdb/testsuite/gdb.cp/print-global-stub.cc +@@ -0,0 +1,31 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2023 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++struct S ++{ ++ S (int); ++ virtual ~S (); ++ ++ int m_i; ++}; ++ ++S s (5); ++ ++int main () ++{ ++ return 0; ++} +--- /dev/null ++++ b/gdb/testsuite/gdb.cp/print-global-stub.exp +@@ -0,0 +1,32 @@ ++# Copyright (C) 2023 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# This file is part of the GDB testsuite. ++# It tests printing of a global stub without inferior. ++ ++require allow_cplus_tests ++ ++standard_testfile .cc ++set objfile [standard_output_file ${testfile}.o] ++ ++if { [gdb_compile $srcdir/$subdir/$srcfile $objfile object \ ++ {c++ debug}] != "" } { ++ untested "failed to compile" ++ return -1 ++} ++ ++clean_restart $objfile ++ ++gdb_test "print s" " = " +-- +2.39.3 + -- cgit v1.2.3