[patch 1/5] Call update_global_location_list conditionally in install_breakpoint

[Yao Qi <yao@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

During `pending tracepoint' work, we find install_breakpoint calls
update_global_location_list(1), which may throw error, and we have (at
the end of create_break() ):

  /* That's it.  Discard the cleanups for data inserted into the
     breakpoint.  */
  discard_cleanups (bkpt_chain);
  /* But cleanup everything else.  */
  do_cleanups (old_chain);

  /* error call may happen here - have BKPT_CHAIN already discarded.  */
  update_global_location_list (1);

  return 1;

So, we should make sure that install_breakpoint called in
create_breakpoint doesn't call update_global_location_list(1), so that
update_global_location_list can be deferred to call at the end of
create_breakpoint.

In this patch, we add a new parameter to determine to call
update_global_location_list.  We pass 0 to install_breakpoint when it is
used in create_breakpoint and its callee.

-- 
Yao (齐尧)

[-- Attachment #2: 0001-refactor-add-one-more-param-in-install_breakpoint.patch --]
[-- Type: text/x-patch, Size: 4054 bytes --]


	* ada-lang.c (create_ada_exception_catchpoint):
	* breakpoint.c (install_breakpoint):  Add one more parameter so that
	update_global_location_list is called conditionally.
	(create_fork_vfork_event_catchpoint): Update.
	(create_syscall_event_catchpoint): Update.
	(create_breakpoint_sal): Update.
	(create_breakpoint_sal): Update. Call do_cleanups before
	install_breakpoint.
	* breakpoint.h (install_breakpoint): Update declaration.
---
 gdb/ada-lang.c   |    2 +-
 gdb/breakpoint.c |   18 ++++++++++--------
 gdb/breakpoint.h |    6 ++++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 1dabd0f..2edbe7f 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -11705,7 +11705,7 @@ create_ada_exception_catchpoint (struct gdbarch *gdbarch,
 				 ops, tempflag, from_tty);
   c->excep_string = excep_string;
   create_excep_cond_exprs (c);
-  install_breakpoint (0, &c->base);
+  install_breakpoint (0, &c->base, 1);
 }
 
 /* Implement the "catch exception" command.  */
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 8f09296..2554337 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -6680,14 +6680,16 @@ init_catchpoint (struct breakpoint *b,
 }
 
 void
-install_breakpoint (int internal, struct breakpoint *b)
+install_breakpoint (int internal, struct breakpoint *b, int update_gll)
 {
   add_to_breakpoint_chain (b);
   set_breakpoint_number (internal, b);
   if (!internal)
     mention (b);
   observer_notify_breakpoint_created (b);
-  update_global_location_list (1);
+
+  if (update_gll)
+    update_global_location_list (1);
 }
 
 static void
@@ -6701,7 +6703,7 @@ create_fork_vfork_event_catchpoint (struct gdbarch *gdbarch,
 
   c->forked_inferior_pid = null_ptid;
 
-  install_breakpoint (0, &c->base);
+  install_breakpoint (0, &c->base, 1);
 }
 
 /* Exec catchpoints.  */
@@ -6822,7 +6824,7 @@ create_syscall_event_catchpoint (int tempflag, VEC(int) *filter,
   init_catchpoint (&c->base, gdbarch, tempflag, NULL, ops);
   c->syscalls_to_be_caught = filter;
 
-  install_breakpoint (0, &c->base);
+  install_breakpoint (0, &c->base, 1);
 }
 
 static int
@@ -7331,7 +7333,7 @@ create_breakpoint_sal (struct gdbarch *gdbarch,
 		       enabled, internal, display_canonical);
   discard_cleanups (old_chain);
 
-  install_breakpoint (internal, b);
+  install_breakpoint (internal, b, 0);
 }
 
 /* Remove element at INDEX_TO_REMOVE from SAL, shifting other
@@ -7961,7 +7963,7 @@ create_breakpoint (struct gdbarch *gdbarch,
 		 corresponds to this one  */
 	      tp->static_trace_marker_id_idx = i;
 
-	      install_breakpoint (internal, &tp->base);
+	      install_breakpoint (internal, &tp->base, 0);
 
 	      do_cleanups (old_chain);
 	    }
@@ -9397,7 +9399,7 @@ watch_command_1 (char *arg, int accessflag, int from_tty,
       throw_exception (e);
     }
 
-  install_breakpoint (internal, b);
+  install_breakpoint (internal, b, 1);
 }
 
 /* Return count of debug registers needed to watch the given expression.
@@ -9795,7 +9797,7 @@ catch_exec_command_1 (char *arg, int from_tty,
 		   &catch_exec_breakpoint_ops);
   c->exec_pathname = NULL;
 
-  install_breakpoint (0, &c->base);
+  install_breakpoint (0, &c->base, 1);
 }
 
 static enum print_stop_action
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 506ae80..8e03264 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -1098,9 +1098,11 @@ extern void
 /* Add breakpoint B on the breakpoint list, and notify the user, the
    target and breakpoint_created observers of its existence.  If
    INTERNAL is non-zero, the breakpoint number will be allocated from
-   the internal breakpoint count.  */
+   the internal breakpoint count.  If UPDATE_GLL is non-zero,
+   update_global_location_list will be called.  */
 
-extern void install_breakpoint (int internal, struct breakpoint *b);
+extern void install_breakpoint (int internal, struct breakpoint *b,
+				int update_gll);
 
 extern int create_breakpoint (struct gdbarch *gdbarch, char *arg,
 			      char *cond_string, int thread,
-- 
1.7.0.4