From e700d1b279b26d4b7d86cfae70d2e022ee748068 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Sat, 31 Jan 2015 12:43:02 -0800 Subject: [PATCH] PR symtab/17855 gdb/ChangeLog: PR symtab/17855 * symfile.c (clear_symtab_users): Move call to breakpoint_re_set to end. --- gdb/ChangeLog | 6 ++++++ gdb/symfile.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 111cc457f42..42c91aaab97 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-01-31 Joel Brobecker + + PR symtab/17855 + * symfile.c (clear_symtab_users): Move call to breakpoint_re_set + to end. + 2015-01-31 Doug Evans * NEWS: Mention inlined scripts in .debug_gdb_scripts section. diff --git a/gdb/symfile.c b/gdb/symfile.c index 86a758a52cd..96c7951be7b 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -3028,8 +3028,6 @@ clear_symtab_users (int add_flags) clear_current_source_symtab_and_line (); clear_displays (); - if ((add_flags & SYMFILE_DEFER_BP_RESET) == 0) - breakpoint_re_set (); clear_last_displayed_sal (); clear_pc_function_cache (); observer_notify_new_objfile (NULL); @@ -3043,6 +3041,10 @@ clear_symtab_users (int add_flags) /* Varobj may refer to old symbols, perform a cleanup. */ varobj_invalidate (); + /* Now that the various caches have been cleared, we can re_set + our breakpoints without risking it using stale data. */ + if ((add_flags & SYMFILE_DEFER_BP_RESET) == 0) + breakpoint_re_set (); } static void -- 2.30.2