[AArch64] PR target/20666, fix wrong encoding of new introduced BFC pseudo

[deliverable/binutils-gdb.git] / gdb / break-catch-throw.c

diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index 3a482058476ea569e681fef67ff57666397be417..153db713eb0cecf8856e36d83837ae612445b9e0 100644 (file)
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -107,7 +107,6 @@ fetch_probe_arguments (struct value **arg0, struct value **arg1)
   struct frame_info *frame = get_selected_frame (_("No frame selected"));
   CORE_ADDR pc = get_frame_pc (frame);
   struct bound_probe pc_probe;
-  const struct sym_probe_fns *pc_probe_fns;
   unsigned n_args;
 
   pc_probe = find_probe_by_pc (pc);
@@ -212,6 +211,7 @@ re_set_exception_catchpoint (struct breakpoint *self)
   struct cleanup *cleanup;
   enum exception_event_kind kind = classify_exception_breakpoint (self);
   struct event_location *location;
+  struct program_space *filter_pspace = current_program_space;
 
   /* We first try to use the probe interface.  */
   TRY
@@ -219,10 +219,9 @@ re_set_exception_catchpoint (struct breakpoint *self)
       location
        = new_probe_location (exception_functions[kind].probe);
       cleanup = make_cleanup_delete_event_location (location);
-      sals = parse_probes (location, NULL);
+      sals = parse_probes (location, filter_pspace, NULL);
       do_cleanups (cleanup);
     }
-
   CATCH (e, RETURN_MASK_ERROR)
     {
       /* Using the probe interface failed.  Let's fallback to the normal
@@ -236,7 +235,7 @@ re_set_exception_catchpoint (struct breakpoint *self)
            = ASTRDUP (exception_functions[kind].function);
          location = new_explicit_location (&explicit_loc);
          cleanup = make_cleanup_delete_event_location (location);
-         self->ops->decode_location (self, location, &sals);
+         self->ops->decode_location (self, location, filter_pspace, &sals);
          do_cleanups (cleanup);
        }
       CATCH (ex, RETURN_MASK_ERROR)
@@ -251,7 +250,7 @@ re_set_exception_catchpoint (struct breakpoint *self)
   END_CATCH
 
   cleanup = make_cleanup (xfree, sals.sals);
-  update_breakpoint_locations (self, sals, sals_end);
+  update_breakpoint_locations (self, filter_pspace, sals, sals_end);
   do_cleanups (cleanup);
 }