[PATCH 29/36] Remove breakpoint_ops from init_ada_exception_breakpoint

Tom Tromey tom@tromey.com
Tue Jan 18 19:40:00 GMT 2022


init_ada_exception_breakpoint is only ever passed a single
breakpoint_ops structure, so remove the parameter.
---
 gdb/ada-lang.c   | 1 -
 gdb/breakpoint.c | 4 ++--
 gdb/breakpoint.h | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 40e369a4626..5b98d824bb4 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -12283,7 +12283,6 @@ create_ada_exception_catchpoint (struct gdbarch *gdbarch,
 
   std::unique_ptr<ada_catchpoint> c (new ada_catchpoint (ex_kind));
   init_ada_exception_breakpoint (c.get (), gdbarch, sal, addr_string.c_str (),
-				 &vtable_breakpoint_ops,
 				 tempflag, disabled, from_tty);
   c->excep_string = excep_string;
   create_excep_cond_exprs (c.get (), ex_kind);
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 117599e2ecc..4885c72d8c0 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -10643,7 +10643,6 @@ init_ada_exception_breakpoint (struct breakpoint *b,
 			       struct gdbarch *gdbarch,
 			       struct symtab_and_line sal,
 			       const char *addr_string,
-			       const struct breakpoint_ops *ops,
 			       int tempflag,
 			       int enabled,
 			       int from_tty)
@@ -10666,7 +10665,8 @@ init_ada_exception_breakpoint (struct breakpoint *b,
 	 enough for now, though.  */
     }
 
-  init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, ops);
+  init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint,
+		       &vtable_breakpoint_ops);
 
   b->enable_state = enabled ? bp_enabled : bp_disabled;
   b->disposition = tempflag ? disp_del : disp_donttouch;
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index e362cd454ec..a17d0080603 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -1500,7 +1500,6 @@ extern void
 				 struct gdbarch *gdbarch,
 				 struct symtab_and_line sal,
 				 const char *addr_string,
-				 const struct breakpoint_ops *ops,
 				 int tempflag,
 				 int enabled,
 				 int from_tty);
-- 
2.31.1



More information about the Gdb-patches mailing list