Change regcache list to be an hash map

[deliverable/binutils-gdb.git] / gdb / cp-abi.c

diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index f82da4b1636d15344d00b342ba9ca7e43e3cce06..bbb74d426382fa0662d8b78340e5dc51793fb51f 100644 (file)
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -79,10 +79,10 @@ baseclass_offset (struct type *type, int index, const gdb_byte *valaddr,
                                                embedded_offset,
                                                address, val);
     }
-  catch (const gdb_exception_RETURN_MASK_ERROR &ex)
+  catch (const gdb_exception_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-       throw_exception (ex);
+       throw;
 
       throw_error (NOT_AVAILABLE_ERROR,
                   _("Cannot determine virtual baseclass offset "
@@ -109,13 +109,14 @@ value_rtti_type (struct value *v, int *full,
 {
   struct type *ret = NULL;
 
-  if ((current_cp_abi.rtti_type) == NULL)
+  if ((current_cp_abi.rtti_type) == NULL
+      || !HAVE_CPLUS_STRUCT (check_typedef (value_type (v))))
     return NULL;
   try
     {
       ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
     }
-  catch (const gdb_exception_RETURN_MASK_ERROR &e)
+  catch (const gdb_exception_error &e)
     {
       return NULL;
     }