#include "complaints.h"
#include "gdbcmd.h"
#include "wrapper.h"
+#include "cp-abi.h"
/* These variables point to the objects
representing the predefined C data types. */
for (j = 0; j < TYPE_FN_FIELDLIST_LENGTH (t, i); j++)
{
- if (DESTRUCTOR_PREFIX_P (TYPE_FN_FIELD_PHYSNAME (f, j)))
+ if (is_destructor_name (TYPE_FN_FIELD_PHYSNAME (f, j)) != 0)
{
*method_indexp = i;
*field_indexp = j;
}
ADD_EXTRA ('\0')
printf ("add_mangled_type: %s\n", extras.str); /* FIXME */
- arm_mangled_name = malloc (strlen (mangled_name) + extras.len);
- sprintf (arm_mangled_name, "%s%s", mangled_name, extras.str);
+ xasprintf (&arm_mangled_name, "%s%s", mangled_name, extras.str);
xfree (mangled_name);
mangled_name = arm_mangled_name;
}
/* Make sure we got back a function string that we can use. */
if (demangled_name)
p = strchr (demangled_name, '(');
+ else
+ p = NULL;
if (demangled_name == NULL || p == NULL)
error ("Internal: Cannot demangle mangled name `%s'.", mangled_name);
return -1;
i = 0;
- vbase = TYPE_VIRTUAL_BASE_LIST (dclass)[0];
+ vbase = virtual_base_list (dclass)[0];
while (vbase)
{
if (vbase == base)
break;
- vbase = TYPE_VIRTUAL_BASE_LIST (dclass)[++i];
+ vbase = virtual_base_list (dclass)[++i];
}
return vbase ? i : -1;
j = -1;
i = 0;
- vbase = TYPE_VIRTUAL_BASE_LIST (dclass)[0];
+ vbase = virtual_base_list (dclass)[0];
while (vbase)
{
if (!primary || (virtual_base_index_skip_primaries (vbase, primary) < 0))
j++;
if (vbase == base)
break;
- vbase = TYPE_VIRTUAL_BASE_LIST (dclass)[++i];
+ vbase = virtual_base_list (dclass)[++i];
}
return vbase ? j : -1;