rpms
/
gdb
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reported gdb-vla-intel-stringbt-fix.patch regression (SuSE).

This commit is contained in:
Jan Kratochvil 2017-04-19 22:30:18 +02:00
parent 1db78d1b38
commit b65f9dc492
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gdb-vla-intel-stringbt-fix.patch
View File

@ -27,17 +27,19 @@ cannot reproduce it.
Thanks, Thanks,
Jan Jan
--- ./gdb/dwarf2loc.c 2016-08-29 04:01:25.000000000 +0200 Index: gdb-7.12.1/gdb/dwarf2loc.c
+++ ./gdb/dwarf2loc.c 2016-09-01 11:00:20.258909494 +0200 ===================================================================
@@ -2289,6 +2289,15 @@ const struct dwarf_expr_context_funcs dw --- gdb-7.12.1.orig/gdb/dwarf2loc.c 2017-04-19 21:46:34.791753815 +0200
+++ gdb-7.12.1/gdb/dwarf2loc.c 2017-04-19 21:58:08.252106538 +0200
@@ -2289,6 +2289,15 @@
dwarf_expr_get_obj_addr dwarf_expr_get_obj_addr
}; };
+static void +static void
+select_frame_cleanup (void *arg) +select_frame_cleanup (void *arg)
+{ +{
+ struct frame_info *frame = (struct frame_info *) arg; + frame_id *frame_id_p = (frame_id *) arg;
+ + struct frame_info *frame (frame_find_by_id (*frame_id_p));
+ if (frame != NULL) + if (frame != NULL)
+ select_frame (frame); + select_frame (frame);
+} +}
@ -45,22 +47,23 @@ Jan
/* Evaluate a location description, starting at DATA and with length /* Evaluate a location description, starting at DATA and with length
SIZE, to find the current location of variable of TYPE in the SIZE, to find the current location of variable of TYPE in the
context of FRAME. BYTE_OFFSET is applied after the contents are context of FRAME. BYTE_OFFSET is applied after the contents are
@@ -2318,6 +2327,11 @@ dwarf2_evaluate_loc_desc_full (struct ty @@ -2318,6 +2327,12 @@
ctx = new_dwarf_expr_context (); ctx = new_dwarf_expr_context ();
old_chain = make_cleanup_free_dwarf_expr_context (ctx); old_chain = make_cleanup_free_dwarf_expr_context (ctx);
+ +
+ make_cleanup (select_frame_cleanup, deprecated_safe_get_selected_frame ()); + frame_id selected_frame_id (get_frame_id (deprecated_safe_get_selected_frame ()));
+ make_cleanup (select_frame_cleanup, &selected_frame_id);
+ if (frame != NULL) + if (frame != NULL)
+ select_frame (frame); + select_frame (frame);
+ +
value_chain = make_cleanup_value_free_to_mark (value_mark ()); value_chain = make_cleanup_value_free_to_mark (value_mark ());
ctx->gdbarch = get_objfile_arch (objfile); ctx->gdbarch = get_objfile_arch (objfile);
Index: gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90 Index: gdb-7.12.1/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90 2015-05-31 16:14:05.844545344 +0200 +++ gdb-7.12.1/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90 2017-04-19 21:46:34.854754214 +0200
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+! Copyright 2010 Free Software Foundation, Inc. +! Copyright 2010 Free Software Foundation, Inc.
+! +!
@ -86,10 +89,10 @@ Index: gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f9
+ real :: dummy + real :: dummy
+ dummy = 1 + dummy = 1
+end subroutine bar +end subroutine bar
Index: gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp Index: gdb-7.12.1/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp 2015-05-31 16:14:05.845545351 +0200 +++ gdb-7.12.1/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp 2017-04-19 21:46:34.854754214 +0200
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+# Copyright 2010 Free Software Foundation, Inc. +# Copyright 2010 Free Software Foundation, Inc.
+ +
@ -130,10 +133,10 @@ Index: gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
+} +}
+ +
+gdb_test "bt" {foo \(string='hello'.*} +gdb_test "bt" {foo \(string='hello'.*}
Index: gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90 Index: gdb-7.12.1/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-7.9.50.20150520/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90 2015-05-31 16:14:05.845545351 +0200 +++ gdb-7.12.1/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90 2017-04-19 21:46:34.855754220 +0200
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+! Copyright 2010 Free Software Foundation, Inc. +! Copyright 2010 Free Software Foundation, Inc.
+! +!

5
gdb.spec
View File

@ -26,7 +26,7 @@ Version: 7.12.1
# The release always contains a leading reserved number, start it at 1. # The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 47%{?dist} Release: 48%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
Group: Development/Debuggers Group: Development/Debuggers
@ -1585,6 +1585,9 @@ then
fi fi
%changelog %changelog
* Wed Apr 19 2017 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.12.1-48.fc25
- Fix reported gdb-vla-intel-stringbt-fix.patch regression (SuSE).
* Wed Mar 8 2017 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.12.1-47.fc25 * Wed Mar 8 2017 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.12.1-47.fc25
- Fix EOL escape in multiline command segv (Pedro Alves, RH BZ 1429172). - Fix EOL escape in multiline command segv (Pedro Alves, RH BZ 1429172).