diff options
author | Nick Alcock <nick.alcock@oracle.com> | 2021-01-05 13:25:56 +0000 |
---|---|---|
committer | Nick Alcock <nick.alcock@oracle.com> | 2021-01-05 14:53:39 +0000 |
commit | ffeece6ac2d4e4d2bf28c910b51c74ffc881c963 (patch) | |
tree | dbb61a523d3289f68a024ed1c84a4290d75b364b /libctf/ctf-dump.c | |
parent | 91e7ce2fd7b82f3982b453d1c6f4576621bc1c2d (diff) | |
download | fsf-binutils-gdb-ffeece6ac2d4e4d2bf28c910b51c74ffc881c963.zip fsf-binutils-gdb-ffeece6ac2d4e4d2bf28c910b51c74ffc881c963.tar.gz fsf-binutils-gdb-ffeece6ac2d4e4d2bf28c910b51c74ffc881c963.tar.bz2 |
libctf, ld: prohibit getting the size or alignment of forwards
C allows you to do only a very few things with entities of incomplete
type (as opposed to pointers to them): make pointers to them and give
them cv-quals, roughly. In particular you can't sizeof them and you
can't get their alignment.
We cannot impose all the requirements the standard imposes on CTF users,
because the deduplicator can transform any structure type into a forward
for the purposes of breaking cycles: so CTF type graphs can easily
contain things like arrays of forward type (if you want to figure out
their size or alignment, you need to chase down the types this forward
might be a forward to in child TU dicts: we will soon add API functions
to make doing this much easier).
Nonetheless, it is still meaningless to ask for the size or alignment of
forwards: but libctf didn't prohibit this and returned nonsense from
internal implementation details when you asked (it returned the kind of
the pointed-to type as both the size and alignment, because forwards
reuse ctt_type as a type kind, and ctt_type and ctt_size overlap). So
introduce a new error, ECTF_INCOMPLETE, which is returned when you try
to get the size or alignment of forwards: we also return it when you try
to do things that require libctf itself to get the size or alignment of
a forward, notably using a forward as an array index type (which C
should never do in any case) or adding forwards to structures without
specifying their offset explicitly.
The dumper will not emit size or alignment info for forwards any more.
(This should not be an API break since ctf_type_size and ctf_type_align
could both return errors before now: any code that isn't expecting error
returns is already potentially broken.)
include/ChangeLog
2021-01-05 Nick Alcock <nick.alcock@oracle.com>
* ctf-api.h (ECTF_INCOMPLETE): New.
(ECTF_NERR): Adjust.
ld/ChangeLog
2021-01-05 Nick Alcock <nick.alcock@oracle.com>
* testsuite/ld-ctf/conflicting-cycle-1.parent.d: Adjust for dumper
changes.
* testsuite/ld-ctf/cross-tu-cyclic-conflicting.d: Likewise.
* testsuite/ld-ctf/forward.c: New test...
* testsuite/ld-ctf/forward.d: ... and results.
libctf/ChangeLog
2021-01-05 Nick Alcock <nick.alcock@oracle.com>
* ctf-types.c (ctf_type_resolve): Improve comment.
(ctf_type_size): Yield ECTF_INCOMPLETE when applied to forwards.
Emit errors into the right dict.
(ctf_type_align): Likewise.
* ctf-create.c (ctf_add_member_offset): Yield ECTF_INCOMPLETE
when adding a member without explicit offset when this member, or
the previous member, is incomplete.
* ctf-dump.c (ctf_dump_format_type): Do not try to print the size of
forwards.
(ctf_dump_member): Do not try to print their alignment.
Diffstat (limited to 'libctf/ctf-dump.c')
-rw-r--r-- | libctf/ctf-dump.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libctf/ctf-dump.c b/libctf/ctf-dump.c index f01f225..abed483 100644 --- a/libctf/ctf-dump.c +++ b/libctf/ctf-dump.c @@ -151,7 +151,7 @@ ctf_dump_format_type (ctf_dict_t *fp, ctf_id_t id, int flag) free (bit); bit = NULL; - if (kind != CTF_K_FUNCTION) + if (kind != CTF_K_FUNCTION && kind != CTF_K_FORWARD) if (asprintf (&bit, " (size 0x%lx)%s", (unsigned long) ctf_type_size (fp, id), nonroot_trailer) < 0) @@ -476,6 +476,7 @@ ctf_dump_member (const char *name, ctf_id_t id, unsigned long offset, char *bit = NULL; ctf_encoding_t ep; int has_encoding = 0; + int opened_paren = 0; /* Align neatly. */ @@ -520,8 +521,9 @@ ctf_dump_member (const char *name, ctf_id_t id, unsigned long offset, ep.cte_bits, (unsigned long) ctf_type_align (state->cdm_fp, id)) < 0) goto oom; + opened_paren = 1; } - else + else if (ctf_type_kind (state->cdm_fp, id) != CTF_K_FORWARD) { if (asprintf (&bit, "[0x%lx] (ID 0x%lx) (kind %i) %s%s%s " "(aligned at 0x%lx", offset, id, @@ -529,6 +531,14 @@ ctf_dump_member (const char *name, ctf_id_t id, unsigned long offset, (name[0] != 0 && typestr[0] != 0) ? " " : "", name, (unsigned long) ctf_type_align (state->cdm_fp, id)) < 0) goto oom; + opened_paren = 1; + } + else /* Forwards have no alignment. */ + { + if (asprintf (&bit, "[0x%lx] (ID 0x%lx) (kind %i) %s%s%s\n", offset, id, + ctf_type_kind (state->cdm_fp, id), typestr, + (name[0] != 0 && typestr[0] != 0) ? " " : "", name) < 0) + goto oom; } *state->cdm_str = str_append (*state->cdm_str, bit); @@ -547,7 +557,8 @@ ctf_dump_member (const char *name, ctf_id_t id, unsigned long offset, bit = NULL; } - *state->cdm_str = str_append (*state->cdm_str, ")\n"); + if (opened_paren) + *state->cdm_str = str_append (*state->cdm_str, ")\n"); return 0; oom: |