K 10 svn:author V 7 git2svn K 8 svn:date V 27 2021-11-22T16:04:46.556467Z K 7 svn:log V 745 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 Sponsored by: Netflix (cherry picked from commit 3cbb4cc200f8a0ad7ed08233425ea54524a21f1c) Git Hash: 4faff19d63053defffe707312c6208c2b1e934ef Git Author: jtl@FreeBSD.org END