Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gdb / frame-unwind.c

diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index 18e157950a047535cc36578bf2020032ce67473e..079a411c205575f93f2a0e632d325a90d98f4399 100644 (file)
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -1,6 +1,6 @@
 /* Definitions for frame unwinder, for GDB, the GNU debugger.
 
-   Copyright (C) 2003-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -26,6 +26,7 @@
 #include "regcache.h"
 #include "gdb_obstack.h"
 #include "target.h"
+#include "gdbarch.h"
 
 static struct gdbarch_data *frame_unwind_data;
 
@@ -105,7 +106,7 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache,
     {
       res = unwinder->sniffer (unwinder, this_frame, this_cache);
     }
-  catch (const gdb_exception_RETURN_MASK_ALL &ex)
+  catch (const gdb_exception &ex)
     {
       /* Catch all exceptions, caused by either interrupt or error.
         Reset *THIS_CACHE.  */
@@ -120,7 +121,7 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache,
             should always accept the frame.  */
          return 0;
        }
-      throw_exception (ex);
+      throw;
     }
 
   if (res)