gdb/

	* breakpoint.h (struct breakpoint_ops) <create_breakpoints_sal>:
	Remove parameter 'lsal'.
	* breakpoint.c (create_breakpoint): Move local variable 'lsal'
	to inner block.  Caller update.
	(base_breakpoint_create_breakpoints_sal): Update.
	(bkpt_create_breakpoints_sal): Likewise.
	(tracepoint_create_breakpoints_sal): Likewise.
	(strace_marker_create_breakpoints_sal): Get 'lsal' from the
	element 0 of vector 'canonical->sals'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de117a2020caa2102ff686bd2d59dbe706811551..bfc5ac04f8464987c1b392f833f2d2278a001ab5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-06  Yao Qi  <yao@codesourcery.com>
+
+       * breakpoint.h (struct breakpoint_ops) <create_breakpoints_sal>:
+       Remove parameter 'lsal'.
+       * breakpoint.c (create_breakpoint): Move local variable 'lsal'
+       to inner block.  Caller update.
+       (base_breakpoint_create_breakpoints_sal): Update.
+       (bkpt_create_breakpoints_sal): Likewise.
+       (tracepoint_create_breakpoints_sal): Likewise.
+       (strace_marker_create_breakpoints_sal): Get 'lsal' from the
+       element 0 of vector 'canonical->sals'.
+
 2013-07-05  Luis Machado  <lgustavo@codesourcery.com>
 
        * rs6000-tdep.c (rs6000_stab_reg_to_regnum): Return the real

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index af6a42a2edca520f2ddc780dcaedb28fc28f3f06..4d09b30873aad73863ae1a84f73fa403400c4dd5 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9610,13 +9610,13 @@ create_breakpoint (struct gdbarch *gdbarch,
      breakpoint.  */
   if (!pending)
     {
-      struct linespec_sals *lsal;
-
-      lsal = VEC_index (linespec_sals, canonical.sals, 0);
-
       if (parse_arg)
         {
          char *rest;
+         struct linespec_sals *lsal;
+
+         lsal = VEC_index (linespec_sals, canonical.sals, 0);
+
          /* Here we only parse 'arg' to separate condition
             from thread number, so parsing in context of first
             sal is OK.  When setting the breakpoint we'll
@@ -9650,7 +9650,7 @@ create_breakpoint (struct gdbarch *gdbarch,
            }
         }
 
-      ops->create_breakpoints_sal (gdbarch, &canonical, lsal,
+      ops->create_breakpoints_sal (gdbarch, &canonical,
                                   cond_string, extra_string, type_wanted,
                                   tempflag ? disp_del : disp_donttouch,
                                   thread, task, ignore_count, ops,
@@ -12723,7 +12723,6 @@ base_breakpoint_create_sals_from_address (char **arg,
 static void
 base_breakpoint_create_breakpoints_sal (struct gdbarch *gdbarch,
                                        struct linespec_result *c,
-                                       struct linespec_sals *lsal,
                                        char *cond_string,
                                        char *extra_string,
                                        enum bptype type_wanted,
@@ -12945,7 +12944,6 @@ bkpt_create_sals_from_address (char **arg,
 static void
 bkpt_create_breakpoints_sal (struct gdbarch *gdbarch,
                             struct linespec_result *canonical,
-                            struct linespec_sals *lsal,
                             char *cond_string,
                             char *extra_string,
                             enum bptype type_wanted,
@@ -13283,7 +13281,6 @@ tracepoint_create_sals_from_address (char **arg,
 static void
 tracepoint_create_breakpoints_sal (struct gdbarch *gdbarch,
                                   struct linespec_result *canonical,
-                                  struct linespec_sals *lsal,
                                   char *cond_string,
                                   char *extra_string,
                                   enum bptype type_wanted,
@@ -13435,7 +13432,6 @@ strace_marker_create_sals_from_address (char **arg,
 static void
 strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch,
                                      struct linespec_result *canonical,
-                                     struct linespec_sals *lsal,
                                      char *cond_string,
                                      char *extra_string,
                                      enum bptype type_wanted,
@@ -13447,6 +13443,8 @@ strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch,
                                      int internal, unsigned flags)
 {
   int i;
+  struct linespec_sals *lsal = VEC_index (linespec_sals,
+                                         canonical->sals, 0);
 
   /* If the user is creating a static tracepoint by marker id
      (strace -m MARKER_ID), then store the sals index, so that

diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 19961fea78d1e24b0ca0d1ac344c988ba364d955..374164c9df525ababbb87b0181ebc3c8742c3cbf 100644 (file)
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -595,8 +595,7 @@ struct breakpoint_ops
      This function is called inside `create_breakpoint'.  */
   void (*create_breakpoints_sal) (struct gdbarch *,
                                  struct linespec_result *,
-                                 struct linespec_sals *, char *,
-                                 char *,
+                                 char *, char *,
                                  enum bptype, enum bpdisp, int, int,
                                  int, const struct breakpoint_ops *,
                                  int, int, int, unsigned);