Rename gdb exception types

[deliverable/binutils-gdb.git] / gdb / ada-lang.c

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 4b51ef1939a7dd40d7f80dcd481b4e9e358d1766..c141adbef3e636a7a106a87c89ebd66e42ee5553 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -6728,7 +6728,7 @@ ada_tag_value_at_base_address (struct value *obj)
       offset_to_top = value_as_long (value_ind (value_ptradd (val, -2)));
     }
 
-  catch (const gdb_exception_RETURN_MASK_ERROR &e)
+  catch (const gdb_exception_error &e)
     {
       return obj;
     }
@@ -6875,7 +6875,7 @@ ada_tag_name (struct value *tag)
       if (tsd != NULL)
        name = ada_tag_name_from_tsd (tsd);
     }
-  catch (const gdb_exception_RETURN_MASK_ERROR &e)
+  catch (const gdb_exception_error &e)
     {
     }
 
@@ -9056,7 +9056,7 @@ ada_to_fixed_type_1 (struct type *type, const gdb_byte *valaddr,
              {
                xvz_found = get_int_var_value (xvz_name, size);
              }
-           catch (const gdb_exception_RETURN_MASK_ERROR &except)
+           catch (const gdb_exception_error &except)
              {
                /* We found the variable, but somehow failed to read
                   its value.  Rethrow the same error, but with a little
@@ -12347,7 +12347,7 @@ ada_exception_message (void)
     {
       e_msg = ada_exception_message_1 ();
     }
-  catch (const gdb_exception_RETURN_MASK_ERROR &e)
+  catch (const gdb_exception_error &e)
     {
       e_msg.reset (nullptr);
     }
@@ -12371,7 +12371,7 @@ ada_exception_name_addr (enum ada_exception_catchpoint_kind ex,
       result = ada_exception_name_addr_1 (ex, b);
     }
 
-  catch (const gdb_exception_RETURN_MASK_ERROR &e)
+  catch (const gdb_exception_error &e)
     {
       warning (_("failed to get exception name: %s"), e.what ());
       return 0;
@@ -12462,7 +12462,7 @@ create_excep_cond_exprs (struct ada_catchpoint *c,
                                 block_for_pc (bl->address),
                                 0);
            }
-         catch (const gdb_exception_RETURN_MASK_ERROR &e)
+         catch (const gdb_exception_error &e)
            {
              warning (_("failed to reevaluate internal exception condition "
                         "for catchpoint %d: %s"),
@@ -12533,7 +12533,7 @@ should_stop_exception (const struct bp_location *bl)
       stop = value_true (evaluate_expression (ada_loc->excep_cond_expr.get ()));
       value_free_to_mark (mark);
     }
-  catch (const gdb_exception_RETURN_MASK_ALL &ex)
+  catch (const gdb_exception &ex)
     {
       exception_fprintf (gdb_stderr, ex,
                         _("Error in testing exception condition:\n"));