forked from Imagelibrary/binutils-gdb
fa4fe27537
GCC permits not only unnamed structs and unions, but cv-qualified ones.
Our earlier fix in 6c3a38777b supported
unnamed structs and unions, but only unqualified ones.
Resolving away cvr-quals of nameless fields (and, irrelevantly, typedefs)
is easy and fixes this problem.
Tests adjusted accordingly.
libctf/
PR libctf/32746
* ctf-types.c (ctf_member_next): Resolve away cv-quals.
(ctf_member_info): Likewise.
* testsuite/libctf-lookup/struct-iteration-ctf.c: Add a cv-qualified
type or two: make sure to keep a non-qualified one.
* testsuite/libctf-lookup/struct-iteration.c: Verify consistency
of ctf_member_next and ctf_member_info.
* testsuite/libctf-lookup/struct-iteration.lk: Adjust.
Tested-by: Stephen Brennan <stephen.s.brennan@oracle.com>
111 lines
2.8 KiB
C
111 lines
2.8 KiB
C
#include <ctf-api.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
static int
|
|
print_struct (const char *name, ctf_id_t membtype, unsigned long offset,
|
|
void *fp_)
|
|
{
|
|
ctf_dict_t *fp = (ctf_dict_t *) fp_;
|
|
char *type_name = ctf_type_aname (fp, membtype);
|
|
|
|
printf ("iter test: %s, offset %lx, has type %lx/%s\n",
|
|
name, offset, membtype, type_name);
|
|
free (type_name);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
ctf_dict_t *fp;
|
|
ctf_archive_t *ctf;
|
|
ctf_id_t type;
|
|
ctf_next_t *i = NULL;
|
|
const char *name;
|
|
ctf_id_t membtype;
|
|
ssize_t offset;
|
|
int icount = 0;
|
|
int err;
|
|
|
|
if (argc != 2)
|
|
{
|
|
fprintf (stderr, "Syntax: %s PROGRAM\n", argv[0]);
|
|
exit(1);
|
|
}
|
|
|
|
if ((ctf = ctf_open (argv[1], NULL, &err)) == NULL)
|
|
goto open_err;
|
|
if ((fp = ctf_dict_open (ctf, NULL, &err)) == NULL)
|
|
goto open_err;
|
|
|
|
/* Iterate over the structure members with each iterator type in turn. */
|
|
|
|
if ((type = ctf_lookup_by_name (fp, "struct foo_t") ) == CTF_ERR)
|
|
goto err;
|
|
|
|
if (ctf_member_iter (fp, type, print_struct, fp) < 0)
|
|
goto ierr;
|
|
|
|
while ((offset = ctf_member_next (fp, type, &i, &name, &membtype,
|
|
CTF_MN_RECURSE)) >= 0)
|
|
{
|
|
ctf_membinfo_t memb;
|
|
char *type_name = ctf_type_aname (fp, membtype);
|
|
|
|
printf ("next test: %s, offset %zx, has type %lx/%s\n",
|
|
name, offset, membtype, type_name);
|
|
free (type_name);
|
|
|
|
/* Check that we can get the same member via ctf_member_info too. */
|
|
if (name[0] != '\0')
|
|
{
|
|
if (ctf_member_info (fp, type, name, &memb) != 0)
|
|
{
|
|
fprintf (stderr, "Cannot get member info for %s: %s\n",
|
|
name, ctf_errmsg (ctf_errno (fp)));
|
|
exit (1);
|
|
}
|
|
if (memb.ctm_offset != offset || memb.ctm_type != membtype)
|
|
{
|
|
fprintf (stderr, "ctf_member_info versus iteration comparison "
|
|
"failure: types %lx/%lx, offsets %zx/%lx\n",
|
|
membtype, memb.ctm_type, offset, memb.ctm_offset);
|
|
}
|
|
}
|
|
}
|
|
if (ctf_errno (fp) != ECTF_NEXT_END)
|
|
goto nerr;
|
|
|
|
/* Now make sure the count of members does not include any recursive
|
|
members. */
|
|
while ((offset = ctf_member_next (fp, type, &i, &name, &membtype, 0)) >= 0)
|
|
icount++;
|
|
|
|
if (ctf_errno (fp) != ECTF_NEXT_END)
|
|
goto nerr;
|
|
|
|
if (icount != ctf_member_count (fp, type))
|
|
printf ("member counts differ: %i by direct iteration, "
|
|
"%i by ctf_member_count\n", icount, ctf_member_count (fp, type));
|
|
|
|
ctf_dict_close (fp);
|
|
ctf_close (ctf);
|
|
|
|
return 0;
|
|
|
|
open_err:
|
|
fprintf (stderr, "%s: cannot open: %s\n", argv[0], ctf_errmsg (err));
|
|
return 1;
|
|
err:
|
|
fprintf (stderr, "Lookup failed: %s\n", ctf_errmsg (ctf_errno (fp)));
|
|
return 1;
|
|
ierr:
|
|
fprintf (stderr, "_iter iteration failed: %s\n", ctf_errmsg (ctf_errno (fp)));
|
|
return 1;
|
|
nerr:
|
|
fprintf (stderr, "_next iteration failed: %s\n", ctf_errmsg (ctf_errno (fp)));
|
|
return 1;
|
|
}
|