HomeFreeBSD

When copying types from one CTF container to another, ensure that we

Description

When copying types from one CTF container to another, ensure that we
always copy intrinsic data types before copying bitfields which are
based on those types. This ensures the type ordering in the destination
CTF container matches the assumption made elsewhere in the CTF code
that instrinsic data types will always appear before bitfields based on
those types.

This resolves the following error message some users have seen after
r366908:

"/usr/lib/dtrace/ipfw.d", line 121: failed to copy type of 'ip6p':
Conflicting type is already defined

Reviewed by: markj
Approved by: re (gjb)
Sponsored by: Netflix

(cherry picked from commit 3cbb4cc200f8a0ad7ed08233425ea54524a21f1c)
(cherry picked from commit 4faff19d63053defffe707312c6208c2b1e934ef)

Details

Provenance
jtlAuthored on Nov 17 2020, 2:07 PM
markjCommitted on Nov 22 2021, 4:31 PM
Parents
rGf266886dd0bc: MFC: rc.d/rctl: unbreak for distinct /usr filesystem
Branches
Unknown
Tags
Unknown