Append $PLT_CFLAGS to CC for NOCROSSREFS tests

[binutils-gdb.git] / gdb / cp-support.c

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 260601fae629ab906a4d6e1b2f18eab41f90114f..3db9751924e11e7d626b688b84b6bb35081255a9 100644 (file)
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -157,7 +157,6 @@ inspect_type (struct demangle_parse_info *info,
   int i;
   char *name;
   struct symbol *sym;
-  volatile struct gdb_exception except;
 
   /* Copy the symbol's name from RET_COMP and look it up
      in the symbol table.  */
@@ -173,12 +172,18 @@ inspect_type (struct demangle_parse_info *info,
     }
 
   sym = NULL;
-  TRY_CATCH (except, RETURN_MASK_ALL)
-  {
-    sym = lookup_symbol (name, 0, VAR_DOMAIN, 0);
-  }
 
-  if (except.reason >= 0 && sym != NULL)
+  TRY
+    {
+      sym = lookup_symbol (name, 0, VAR_DOMAIN, 0);
+    }
+  CATCH (except, RETURN_MASK_ALL)
+    {
+      return 0;
+    }
+  END_CATCH
+
+  if (sym != NULL)
     {
       struct type *otype = SYMBOL_TYPE (sym);
 
@@ -241,18 +246,19 @@ inspect_type (struct demangle_parse_info *info,
            }
 
          buf = mem_fileopen ();
-         TRY_CATCH (except, RETURN_MASK_ERROR)
+         TRY
          {
            type_print (type, "", buf, -1);
          }
 
          /* If type_print threw an exception, there is little point
             in continuing, so just bow out gracefully.  */
-         if (except.reason < 0)
+         CATCH (except, RETURN_MASK_ERROR)
            {
              ui_file_delete (buf);
              return 0;
            }
+         END_CATCH
 
          name = ui_file_obsavestring (buf, &info->obstack, &len);
          ui_file_delete (buf);
@@ -446,17 +452,21 @@ replace_typedefs (struct demangle_parse_info *info,
 
          if (local_name != NULL)
            {
-             struct symbol *sym;
-             volatile struct gdb_exception except;
+             struct symbol *sym = NULL;
 
              sym = NULL;
-             TRY_CATCH (except, RETURN_MASK_ALL)
+             TRY
                {
                  sym = lookup_symbol (local_name, 0, VAR_DOMAIN, 0);
                }
+             CATCH (except, RETURN_MASK_ALL)
+               {
+               }
+             END_CATCH
+
              xfree (local_name);
 
-             if (except.reason >= 0 && sym != NULL)
+             if (sym != NULL)
                {
                  struct type *otype = SYMBOL_TYPE (sym);
                  const char *new_name = (*finder) (otype, data);
@@ -1443,7 +1453,9 @@ cp_lookup_rtti_type (const char *name, struct block *block)
   struct symbol * rtti_sym;
   struct type * rtti_type;
 
-  rtti_sym = lookup_symbol (name, block, STRUCT_DOMAIN, NULL);
+  /* Use VAR_DOMAIN here as NAME may be a typedef.  PR 18141, 18417.
+     Classes "live" in both STRUCT_DOMAIN and VAR_DOMAIN.  */
+  rtti_sym = lookup_symbol (name, block, VAR_DOMAIN, NULL);
 
   if (rtti_sym == NULL)
     {
@@ -1457,7 +1469,7 @@ cp_lookup_rtti_type (const char *name, struct block *block)
       return NULL;
     }
 
-  rtti_type = SYMBOL_TYPE (rtti_sym);
+  rtti_type = check_typedef (SYMBOL_TYPE (rtti_sym));
 
   switch (TYPE_CODE (rtti_type))
     {