From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dodji@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	by sourceware.org (Postfix) with ESMTPS id B65913857C44
	for <libabigail@sourceware.org>; Mon, 29 Aug 2022 09:44:37 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B65913857C44
Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1661766276;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type;
	bh=53201O4ZmxXTeVUaeyh31D9023WxwXu6M2NUXPi02yc=;
	b=ehVq0V3XznZ9bBAPAwPEjyy52dYNo0zmPPGt4O4QPee8nJ7yyLqAA0WZwfPvG2F+0akBk2
	HTt63Q2v5jyNqrZ2v5mDdjp+fpEydg4YQNdYNOSd2feDMP6t8EutDmqpT2XcP2uN86yme+
	jher+alFph3ntTr80wYPCtjbZ2ICO1M=
Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com
 [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id
 us-mta-267-R4z_x2qNOs-Rj4sds3_f9g-1; Mon, 29 Aug 2022 05:44:35 -0400
X-MC-Unique: R4z_x2qNOs-Rj4sds3_f9g-1
Received: by mail-qk1-f197.google.com with SMTP id bm11-20020a05620a198b00b006bb2388ef0cso6177623qkb.5
        for <libabigail@sourceware.org>; Mon, 29 Aug 2022 02:44:35 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=mime-version:user-agent:message-id:date:organization:subject:to
         :from:x-gm-message-state:from:to:cc;
        bh=53201O4ZmxXTeVUaeyh31D9023WxwXu6M2NUXPi02yc=;
        b=HlJIAKhG54zP3dLGzS23tMRyj0S77UNMBZAcvx7dKeK9riPTMzlCE40XvOVJ/kxgtl
         BQEOGaQH75rXhxiTcyZgEjWSgF7ZzbyDf0GT371rFGSW0iuWdmo+7wkl8ayn4pBnKRLJ
         ZnIN0PBZVcLiMFk97gr9yTZP2qOwc0QyNI30bB96gNqmxmKfbFrh8g9w9qz2qeLKTDqV
         H4VqrudN7h1BmeCvVlvtp/whZZoj3sfJvFW8JTW5kZpsCa9T74Ss2vCUMdmbS8k1F3mM
         qTEUy1H9Jdm8NbAv2WlFezMI/SgEYIr/rj7pnIITppznTB4NLIGRnieYhTSb+xJqreEY
         aOhA==
X-Gm-Message-State: ACgBeo35S5UV8ZMAKBaUegnxcIOduyP8tCJjsSZOtvhnFCGKrn+zH0/1
	qM4JW+ea6Sqjee+0KEC9c3KVX3MQ9QpAsszp1lbuNSLzovwLtRSuLMcrKcp1Yv8F5MZyLzKZhE+
	CILa05xqQL/+9tsnz7jyhpKdcxvXQB5OKjiwHaSINXArFR+MTTGQecbS/D1HRbnOlC++4
X-Received: by 2002:a05:622a:13c7:b0:343:7907:b42c with SMTP id p7-20020a05622a13c700b003437907b42cmr9202653qtk.435.1661766273989;
        Mon, 29 Aug 2022 02:44:33 -0700 (PDT)
X-Google-Smtp-Source: AA6agR77RgKlqolMBJik1artZRP10Zy5tR/KSvPaPlmo04nxSMgSGTXrfu0blj13FaYZn8Sa0rwHag==
X-Received: by 2002:a05:622a:13c7:b0:343:7907:b42c with SMTP id p7-20020a05622a13c700b003437907b42cmr9202622qtk.435.1661766273069;
        Mon, 29 Aug 2022 02:44:33 -0700 (PDT)
Received: from localhost ([88.120.130.27])
        by smtp.gmail.com with ESMTPSA id y6-20020a05620a25c600b006b9c355ed75sm5642553qko.70.2022.08.29.02.44.32
        for <libabigail@sourceware.org>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 29 Aug 2022 02:44:32 -0700 (PDT)
Received: by localhost (Postfix, from userid 1000)
	id 11A3F5802BD; Mon, 29 Aug 2022 11:44:29 +0200 (CEST)
From: Dodji Seketeli <dodji@redhat.com>
To: libabigail@sourceware.org
Subject: [PATCH, applied] Update test-read-ctf reference output
Organization: Red Hat / France
X-Operating-System: Fedora 38
X-URL: http://www.redhat.com
Date: Mon, 29 Aug 2022 11:44:29 +0200
Message-ID: <87tu5vl6yq.fsf@redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain
X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <libabigail.sourceware.org>

Hello,

It seems like some recent changes have changed the reference expected
output of the test-read-ctf tests.  I believe it's this change that is the culprit:

	df28c220 writer: Make sorting referenced typedefs types stable in abixml

This patch updates the expected reference output accordingly.

	* tests/data/test-read-ctf/test-PR26568-1.o.abi: Adjust.
	* tests/data/test-read-ctf/test-PR26568-2.o.abi: Likewise.
	* tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi:
	Likewise.
	* tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi:
	Likewise.
	* tests/data/test-read-ctf/test-anonymous-fields.o.abi: Likewise.
	* tests/data/test-read-ctf/test-array-of-pointers.abi: Likewise.
	* tests/data/test-read-ctf/test-callback2.abi: Likewise.
	* tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi:
	Likewise.
	* tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi:
	Likewise.
	* tests/data/test-read-ctf/test-list-struct.abi: Likewise.
	* tests/data/test-read-ctf/test0.abi: Likewise.
	* tests/data/test-read-ctf/test0.hash.abi: Likewise.
	* tests/data/test-read-ctf/test1.so.abi: Likewise.
	* tests/data/test-read-ctf/test1.so.hash.abi: Likewise.
	* tests/data/test-read-ctf/test7.o.abi: Likewise.
	* tests/data/test-read-ctf/test9.o.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 tests/data/test-read-ctf/test-PR26568-1.o.abi | 24 ++++-----
 tests/data/test-read-ctf/test-PR26568-2.o.abi | 16 +++---
 .../test-ambiguous-struct-A.o.hash.abi        | 10 ++--
 .../test-ambiguous-struct-B.o.hash.abi        |  2 +-
 .../test-read-ctf/test-anonymous-fields.o.abi | 16 +++---
 .../test-read-ctf/test-array-of-pointers.abi  | 28 +++++------
 tests/data/test-read-ctf/test-callback2.abi   | 12 ++---
 .../test-conflicting-type-syms-a.o.hash.abi   |  6 +--
 .../test-conflicting-type-syms-b.o.hash.abi   |  6 +--
 tests/data/test-read-ctf/test-list-struct.abi | 14 +++---
 tests/data/test-read-ctf/test0.abi            | 34 ++++++-------
 tests/data/test-read-ctf/test0.hash.abi       | 26 +++++-----
 tests/data/test-read-ctf/test1.so.abi         | 18 +++----
 tests/data/test-read-ctf/test1.so.hash.abi    | 10 ++--
 tests/data/test-read-ctf/test7.o.abi          | 18 +++----
 tests/data/test-read-ctf/test9.o.abi          | 50 +++++++++----------
 16 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/tests/data/test-read-ctf/test-PR26568-1.o.abi b/tests/data/test-read-ctf/test-PR26568-1.o.abi
index 1b19fd9a..7df180d4 100644
--- a/tests/data/test-read-ctf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-1.o.abi
@@ -3,32 +3,32 @@
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <class-decl name='A' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-1'>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
+    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
+    <class-decl name='A' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-3'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-2' visibility='default'/>
+        <var-decl name='' type-id='type-id-4' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='' size-in-bits='32' alignment-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-3'>
+    <class-decl name='' size-in-bits='32' alignment-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-5'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-4' visibility='default'/>
+        <var-decl name='x' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='' size-in-bits='64' alignment-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-5'>
+    <class-decl name='' size-in-bits='64' alignment-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='y' type-id='type-id-6' visibility='default'/>
+        <var-decl name='y' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-4'/>
-    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
-    <union-decl name='' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-2'>
+    <union-decl name='' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-4'>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-3' visibility='default'/>
+        <var-decl name='' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-5' visibility='default'/>
+        <var-decl name='' type-id='type-id-6' visibility='default'/>
       </data-member>
     </union-decl>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
     <function-decl name='fun' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='fun'>
       <parameter type-id='type-id-7'/>
       <return type-id='type-id-8'/>
diff --git a/tests/data/test-read-ctf/test-PR26568-2.o.abi b/tests/data/test-read-ctf/test-PR26568-2.o.abi
index c6f3fbbb..44f72263 100644
--- a/tests/data/test-read-ctf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-2.o.abi
@@ -3,24 +3,24 @@
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <class-decl name='' size-in-bits='32' alignment-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1'>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
+    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
+    <class-decl name='' size-in-bits='32' alignment-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-3'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-2' visibility='default'/>
+        <var-decl name='x' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='' size-in-bits='64' alignment-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-3'>
+    <class-decl name='' size-in-bits='64' alignment-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-4'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='y' type-id='type-id-4' visibility='default'/>
+        <var-decl name='y' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-2'/>
-    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-4'/>
     <union-decl name='A' size-in-bits='64' visibility='default' id='type-id-5'>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-1' visibility='default'/>
+        <var-decl name='' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-3' visibility='default'/>
+        <var-decl name='' type-id='type-id-4' visibility='default'/>
       </data-member>
     </union-decl>
     <pointer-type-def type-id='type-id-5' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
diff --git a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
index 28dbed48..b9c2d333 100644
--- a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
+++ b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
@@ -4,17 +4,18 @@
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
     <array-type-def dimensions='1' type-id='3ed987a4' size-in-bits='12800' alignment-in-bits='64' id='e022be37'>
-      <subrange length='50' type-id='7359adad' id='3c1860ce'/>
+      <subrange length='50' type-id='f0981eeb' id='3c1860ce'/>
     </array-type-def>
+    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='95e97e5e'/>
     <class-decl name='A' size-in-bits='256' alignment-in-bits='64' is-struct='yes' visibility='default' id='3ed987a4'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='b' type-id='41d98c5d' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='foo' type-id='bd54fe1a' visibility='default'/>
+        <var-decl name='foo' type-id='95e97e5e' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='bar' type-id='bd54fe1a' visibility='default'/>
+        <var-decl name='bar' type-id='95e97e5e' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='b2' type-id='41d98c5d' visibility='default'/>
@@ -25,8 +26,7 @@
         <var-decl name='a' type-id='84d5ac12' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='bd54fe1a'/>
-    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='7359adad'/>
+    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='f0981eeb'/>
     <pointer-type-def type-id='3ed987a4' size-in-bits='64' alignment-in-bits='64' id='84d5ac12'/>
     <pointer-type-def type-id='1c12b755' size-in-bits='64' alignment-in-bits='64' id='55cd64e8'/>
     <var-decl name='foo' type-id='55cd64e8' mangled-name='foo' visibility='default' elf-symbol-id='foo'/>
diff --git a/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi b/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
index 83d21919..cba10afd 100644
--- a/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
+++ b/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
@@ -3,6 +3,7 @@
     <elf-symbol name='a' size='24' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='95e97e5e'/>
     <class-decl name='A' size-in-bits='192' alignment-in-bits='64' is-struct='yes' visibility='default' id='3ed987a4'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='b' type-id='41d98c5d' visibility='default'/>
@@ -19,7 +20,6 @@
         <var-decl name='a' type-id='84d5ac12' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='95e97e5e'/>
     <pointer-type-def type-id='3ed987a4' size-in-bits='64' alignment-in-bits='64' id='84d5ac12'/>
     <var-decl name='a' type-id='3ed987a4' mangled-name='a' visibility='default' elf-symbol-id='a'/>
   </abi-instr>
diff --git a/tests/data/test-read-ctf/test-anonymous-fields.o.abi b/tests/data/test-read-ctf/test-anonymous-fields.o.abi
index 783b6982..2df54c3b 100644
--- a/tests/data/test-read-ctf/test-anonymous-fields.o.abi
+++ b/tests/data/test-read-ctf/test-anonymous-fields.o.abi
@@ -3,14 +3,15 @@
     <elf-symbol name='t' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <class-decl name='uprobe_task' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-1'>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
+    <class-decl name='uprobe_task' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-2'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-2' visibility='default'/>
+        <var-decl name='' type-id='type-id-3' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='' size-in-bits='32' alignment-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-3'>
+    <class-decl name='' size-in-bits='32' alignment-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-4'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dup_xol_work' type-id='type-id-4' visibility='default'/>
+        <var-decl name='dup_xol_work' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
     <class-decl name='' size-in-bits='64' alignment-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-5'>
@@ -18,16 +19,15 @@
         <var-decl name='vaddr' type-id='type-id-6' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-4'/>
-    <union-decl name='' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-2'>
+    <union-decl name='' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-3'>
       <data-member access='public'>
         <var-decl name='' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='' type-id='type-id-3' visibility='default'/>
+        <var-decl name='' type-id='type-id-4' visibility='default'/>
       </data-member>
     </union-decl>
     <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
-    <var-decl name='t' type-id='type-id-1' mangled-name='t' visibility='default' elf-symbol-id='t'/>
+    <var-decl name='t' type-id='type-id-2' mangled-name='t' visibility='default' elf-symbol-id='t'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test-array-of-pointers.abi b/tests/data/test-read-ctf/test-array-of-pointers.abi
index 195361df..47135315 100644
--- a/tests/data/test-read-ctf/test-array-of-pointers.abi
+++ b/tests/data/test-read-ctf/test-array-of-pointers.abi
@@ -3,34 +3,34 @@
     <elf-symbol name='t' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <class-decl name='cgroup' size-in-bits='256' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-1'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='256' alignment-in-bits='64' id='type-id-2'>
+      <subrange length='4' type-id='type-id-3' id='type-id-4'/>
+    </array-type-def>
+    <class-decl name='cgroup' size-in-bits='256' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-5'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='s1' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='css_set' size-in-bits='256' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-3'>
+    <class-decl name='css_set' size-in-bits='256' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='s0' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='state' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-4'>
+    <class-decl name='state' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-7'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cg' type-id='type-id-5' visibility='default'/>
+        <var-decl name='cg' type-id='type-id-8' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='task' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-6'>
+    <class-decl name='task' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-9'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='s' type-id='type-id-7' visibility='default'/>
+        <var-decl name='s' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-8' size-in-bits='256' alignment-in-bits='64' id='type-id-2'>
-      <subrange length='4' type-id='type-id-9' id='type-id-10'/>
-    </array-type-def>
-    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='type-id-9'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-5'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' alignment-in-bits='64' id='type-id-8'/>
-    <pointer-type-def type-id='type-id-6' size-in-bits='64' alignment-in-bits='64' id='type-id-11'/>
+    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' alignment-in-bits='64' id='type-id-8'/>
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' alignment-in-bits='64' id='type-id-10'/>
+    <pointer-type-def type-id='type-id-7' size-in-bits='64' alignment-in-bits='64' id='type-id-1'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' alignment-in-bits='64' id='type-id-11'/>
     <var-decl name='t' type-id='type-id-11' mangled-name='t' visibility='default' elf-symbol-id='t'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test-callback2.abi b/tests/data/test-read-ctf/test-callback2.abi
index ddc3e493..c2ffdb18 100644
--- a/tests/data/test-read-ctf/test-callback2.abi
+++ b/tests/data/test-read-ctf/test-callback2.abi
@@ -3,18 +3,18 @@
     <elf-symbol name='s0' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <class-decl name='s0' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-1'>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
+    <class-decl name='s0' size-in-bits='64' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-2'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mem_fun' type-id='type-id-2' visibility='default'/>
+        <var-decl name='mem_fun' type-id='type-id-3' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-3'/>
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-5'/>
+    <pointer-type-def type-id='type-id-4' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-5'/>
     <var-decl name='s0' type-id='type-id-5' mangled-name='s0' visibility='default' elf-symbol-id='s0'/>
     <function-type size-in-bits='64' alignment-in-bits='8' id='type-id-4'>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-3'/>
+      <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi b/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
index 3260b352..859ba2a6 100644
--- a/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
+++ b/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
@@ -4,11 +4,11 @@
     <elf-symbol name='ignore2' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='bd54fe1a'/>
+    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='95e97e5e'/>
     <pointer-type-def type-id='40acc204' size-in-bits='64' alignment-in-bits='64' id='c6fd4117'/>
     <var-decl name='a' type-id='c6fd4117' mangled-name='a' visibility='default' elf-symbol-id='a'/>
     <var-decl name='ignore2' type-id='b3d2db81' mangled-name='ignore2' visibility='default' elf-symbol-id='ignore2'/>
-    <typedef-decl name='a_t' type-id='bd54fe1a' id='40acc204'/>
-    <typedef-decl name='b_t' type-id='bd54fe1a' id='b3d2db81'/>
+    <typedef-decl name='a_t' type-id='95e97e5e' id='40acc204'/>
+    <typedef-decl name='b_t' type-id='95e97e5e' id='b3d2db81'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi b/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
index 286fd479..c4870434 100644
--- a/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
+++ b/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
@@ -4,10 +4,10 @@
     <elf-symbol name='ignore1' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='bd54fe1a'/>
+    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='95e97e5e'/>
     <var-decl name='b' type-id='40acc204' mangled-name='b' visibility='default' elf-symbol-id='b'/>
     <var-decl name='ignore1' type-id='b3d2db81' mangled-name='ignore1' visibility='default' elf-symbol-id='ignore1'/>
-    <typedef-decl name='a_t' type-id='bd54fe1a' id='40acc204'/>
-    <typedef-decl name='b_t' type-id='bd54fe1a' id='b3d2db81'/>
+    <typedef-decl name='a_t' type-id='95e97e5e' id='40acc204'/>
+    <typedef-decl name='b_t' type-id='95e97e5e' id='b3d2db81'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test-list-struct.abi b/tests/data/test-read-ctf/test-list-struct.abi
index deb6a4a1..ecd4d08b 100644
--- a/tests/data/test-read-ctf/test-list-struct.abi
+++ b/tests/data/test-read-ctf/test-list-struct.abi
@@ -4,17 +4,17 @@
     <elf-symbol name='n2' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <class-decl name='rb_node_b' size-in-bits='128' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-1'>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
+    <class-decl name='rb_node_b' size-in-bits='128' alignment-in-bits='64' is-struct='yes' visibility='default' id='type-id-2'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='this' type-id='type-id-2' visibility='default'/>
+        <var-decl name='this' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='a' type-id='type-id-3' visibility='default'/>
+        <var-decl name='a' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-3'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
-    <var-decl name='n1' type-id='type-id-1' mangled-name='n1' visibility='default' elf-symbol-id='n1'/>
-    <var-decl name='n2' type-id='type-id-1' mangled-name='n2' visibility='default' elf-symbol-id='n2'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
+    <var-decl name='n1' type-id='type-id-2' mangled-name='n1' visibility='default' elf-symbol-id='n1'/>
+    <var-decl name='n2' type-id='type-id-2' mangled-name='n2' visibility='default' elf-symbol-id='n2'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test0.abi b/tests/data/test-read-ctf/test0.abi
index fc61f2ac..7a250218 100644
--- a/tests/data/test-read-ctf/test0.abi
+++ b/tests/data/test-read-ctf/test0.abi
@@ -19,12 +19,19 @@
   <abi-instr address-size='64' language='LANG_C'>
     <type-decl name='' is-anonymous='yes' size-in-bits='1' alignment-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-2'/>
-    <class-decl name='S' size-in-bits='32' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-3'>
+    <type-decl name='float' size-in-bits='32' alignment-in-bits='32' id='type-id-3'/>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-4'/>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='320' alignment-in-bits='32' id='type-id-5'>
+      <subrange length='10' type-id='type-id-6' id='type-id-7'/>
+    </array-type-def>
+    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-8'/>
+    <type-decl name='short int' size-in-bits='16' alignment-in-bits='16' id='type-id-9'/>
+    <class-decl name='S' size-in-bits='32' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-10'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='m0' type-id='type-id-4' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='' size-in-bits='32' alignment-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-5'>
+    <class-decl name='' size-in-bits='32' alignment-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-11'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='status0' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -32,24 +39,17 @@
         <var-decl name='status1' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='float' size-in-bits='32' alignment-in-bits='32' id='type-id-6'/>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-4'/>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='320' alignment-in-bits='32' id='type-id-7'>
-      <subrange length='10' type-id='type-id-8' id='type-id-9'/>
-    </array-type-def>
-    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-10'/>
-    <type-decl name='short int' size-in-bits='16' alignment-in-bits='16' id='type-id-11'/>
-    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='type-id-8'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' alignment-in-bits='64' id='type-id-12'/>
+    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
+    <pointer-type-def type-id='type-id-10' size-in-bits='64' alignment-in-bits='64' id='type-id-12'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-13'/>
-    <qualified-type-def type-id='type-id-3' const='yes' id='type-id-14'/>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' alignment-in-bits='64' id='type-id-15'/>
+    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-8' size-in-bits='64' alignment-in-bits='64' id='type-id-15'/>
     <qualified-type-def type-id='type-id-15' restrict='yes' id='type-id-16'/>
-    <qualified-type-def type-id='type-id-11' volatile='yes' id='type-id-17'/>
-    <var-decl name='status' type-id='type-id-5' mangled-name='status' visibility='default' elf-symbol-id='status'/>
+    <qualified-type-def type-id='type-id-9' volatile='yes' id='type-id-17'/>
+    <var-decl name='status' type-id='type-id-11' mangled-name='status' visibility='default' elf-symbol-id='status'/>
     <var-decl name='test_pointer' type-id='type-id-13' mangled-name='test_pointer' visibility='default' elf-symbol-id='test_pointer'/>
     <var-decl name='test_const' type-id='type-id-14' mangled-name='test_const' visibility='default' elf-symbol-id='test_const'/>
-    <var-decl name='test_float' type-id='type-id-6' mangled-name='test_float' visibility='default' elf-symbol-id='test_float'/>
+    <var-decl name='test_float' type-id='type-id-3' mangled-name='test_float' visibility='default' elf-symbol-id='test_float'/>
     <function-decl name='foo_1' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='foo_1'>
       <parameter type-id='type-id-12'/>
       <return type-id='type-id-4'/>
@@ -57,7 +57,7 @@
     <function-decl name='main' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='main'>
       <return type-id='type-id-4'/>
     </function-decl>
-    <var-decl name='test_array' type-id='type-id-7' mangled-name='test_array' visibility='default' elf-symbol-id='test_array'/>
+    <var-decl name='test_array' type-id='type-id-5' mangled-name='test_array' visibility='default' elf-symbol-id='test_array'/>
     <var-decl name='test_restrict' type-id='type-id-16' mangled-name='test_restrict' visibility='default' elf-symbol-id='test_restrict'/>
     <var-decl name='test_volatile' type-id='type-id-17' mangled-name='test_volatile' visibility='default' elf-symbol-id='test_volatile'/>
   </abi-instr>
diff --git a/tests/data/test-read-ctf/test0.hash.abi b/tests/data/test-read-ctf/test0.hash.abi
index fa1daebc..09e76da1 100644
--- a/tests/data/test-read-ctf/test0.hash.abi
+++ b/tests/data/test-read-ctf/test0.hash.abi
@@ -19,6 +19,13 @@
   <abi-instr address-size='64' language='LANG_C'>
     <type-decl name='' is-anonymous='yes' size-in-bits='1' alignment-in-bits='8' id='811c9dc5'/>
     <type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='a84c031d'/>
+    <type-decl name='float' size-in-bits='32' alignment-in-bits='32' id='a6c45d85'/>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='95e97e5e'/>
+    <array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='320' alignment-in-bits='32' id='b7bd1749'>
+      <subrange length='10' type-id='f0981eeb' id='487da03a'/>
+    </array-type-def>
+    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='95e97e5f'/>
+    <type-decl name='short int' size-in-bits='16' alignment-in-bits='16' id='95e97e60'/>
     <class-decl name='S' size-in-bits='32' alignment-in-bits='32' is-struct='yes' visibility='default' id='50d9a3fa'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='m0' type-id='95e97e5e' visibility='default'/>
@@ -32,20 +39,13 @@
         <var-decl name='status1' type-id='811c9dc5' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='float' size-in-bits='32' alignment-in-bits='32' id='a6c45d85'/>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='95e97e5e'/>
-    <array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='320' alignment-in-bits='32' id='b7bd1749'>
-      <subrange length='10' type-id='7359adad' id='487da03a'/>
-    </array-type-def>
-    <type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='bd54fe1a'/>
-    <type-decl name='short int' size-in-bits='16' alignment-in-bits='16' id='a2185560'/>
-    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='7359adad'/>
+    <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='f0981eeb'/>
     <pointer-type-def type-id='50d9a3fa' size-in-bits='64' alignment-in-bits='64' id='fd01f598'/>
     <pointer-type-def type-id='a84c031d' size-in-bits='64' alignment-in-bits='64' id='26a90f95'/>
     <qualified-type-def type-id='50d9a3fa' const='yes' id='0fb3b55d'/>
-    <pointer-type-def type-id='bd54fe1a' size-in-bits='64' alignment-in-bits='64' id='3ccc2590'/>
-    <qualified-type-def type-id='3ccc2590' restrict='yes' id='af4b1b38'/>
-    <qualified-type-def type-id='a2185560' volatile='yes' id='ec67e496'/>
+    <pointer-type-def type-id='95e97e5f' size-in-bits='64' alignment-in-bits='64' id='7292109c'/>
+    <qualified-type-def type-id='7292109c' restrict='yes' id='6942f6a4'/>
+    <qualified-type-def type-id='95e97e60' volatile='yes' id='e024ff18'/>
     <var-decl name='status' type-id='b91ffdee' mangled-name='status' visibility='default' elf-symbol-id='status'/>
     <var-decl name='test_pointer' type-id='26a90f95' mangled-name='test_pointer' visibility='default' elf-symbol-id='test_pointer'/>
     <var-decl name='test_const' type-id='0fb3b55d' mangled-name='test_const' visibility='default' elf-symbol-id='test_const'/>
@@ -58,7 +58,7 @@
       <return type-id='95e97e5e'/>
     </function-decl>
     <var-decl name='test_array' type-id='b7bd1749' mangled-name='test_array' visibility='default' elf-symbol-id='test_array'/>
-    <var-decl name='test_restrict' type-id='af4b1b38' mangled-name='test_restrict' visibility='default' elf-symbol-id='test_restrict'/>
-    <var-decl name='test_volatile' type-id='ec67e496' mangled-name='test_volatile' visibility='default' elf-symbol-id='test_volatile'/>
+    <var-decl name='test_restrict' type-id='6942f6a4' mangled-name='test_restrict' visibility='default' elf-symbol-id='test_restrict'/>
+    <var-decl name='test_volatile' type-id='e024ff18' mangled-name='test_volatile' visibility='default' elf-symbol-id='test_volatile'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test1.so.abi b/tests/data/test-read-ctf/test1.so.abi
index a7cd965f..cbf377e2 100644
--- a/tests/data/test-read-ctf/test1.so.abi
+++ b/tests/data/test-read-ctf/test1.so.abi
@@ -4,25 +4,25 @@
   </elf-function-symbols>
   <abi-instr address-size='64' language='LANG_C'>
     <type-decl name='' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
-    <class-decl name='opaque_struct' size-in-bits='32' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-2'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='m0' type-id='type-id-3' visibility='default'/>
-      </data-member>
-    </class-decl>
-    <enum-decl name='opaque_enum' linkage-name='opaque_enum' id='type-id-4'>
+    <enum-decl name='opaque_enum' linkage-name='opaque_enum' id='type-id-2'>
       <underlying-type type-id='type-id-1'/>
       <enumerator name='e0' value='0'/>
       <enumerator name='e1' value='1'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' alignment-in-bits='64' id='type-id-5'/>
+    <class-decl name='opaque_struct' size-in-bits='32' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-3'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='m0' type-id='type-id-4' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <pointer-type-def type-id='type-id-4' size-in-bits='64' alignment-in-bits='64' id='type-id-5'/>
     <pointer-type-def type-id='type-id-6' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
     <function-decl name='fn' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='fn'>
       <parameter type-id='type-id-7'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <typedef-decl name='opaque_enum' type-id='type-id-4' id='type-id-3'/>
-    <typedef-decl name='opaque_struct' type-id='type-id-2' id='type-id-6'/>
+    <typedef-decl name='opaque_enum' type-id='type-id-2' id='type-id-4'/>
+    <typedef-decl name='opaque_struct' type-id='type-id-3' id='type-id-6'/>
     <type-decl name='void' id='type-id-8'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test1.so.hash.abi b/tests/data/test-read-ctf/test1.so.hash.abi
index d2fb6a49..a194dac0 100644
--- a/tests/data/test-read-ctf/test1.so.hash.abi
+++ b/tests/data/test-read-ctf/test1.so.hash.abi
@@ -4,16 +4,16 @@
   </elf-function-symbols>
   <abi-instr address-size='64' language='LANG_C'>
     <type-decl name='' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='811c9dc5'/>
-    <class-decl name='opaque_struct' size-in-bits='32' alignment-in-bits='32' is-struct='yes' visibility='default' id='6cde5052'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='m0' type-id='99fcd3a5' visibility='default'/>
-      </data-member>
-    </class-decl>
     <enum-decl name='opaque_enum' linkage-name='opaque_enum' id='55763a91'>
       <underlying-type type-id='811c9dc5'/>
       <enumerator name='e0' value='0'/>
       <enumerator name='e1' value='1'/>
     </enum-decl>
+    <class-decl name='opaque_struct' size-in-bits='32' alignment-in-bits='32' is-struct='yes' visibility='default' id='6cde5052'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='m0' type-id='99fcd3a5' visibility='default'/>
+      </data-member>
+    </class-decl>
     <pointer-type-def type-id='99fcd3a5' size-in-bits='64' alignment-in-bits='64' id='0e0526e0'/>
     <pointer-type-def type-id='dae69ca1' size-in-bits='64' alignment-in-bits='64' id='3f6e71d0'/>
     <function-decl name='fn' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='fn'>
diff --git a/tests/data/test-read-ctf/test7.o.abi b/tests/data/test-read-ctf/test7.o.abi
index 86eb6c86..5c802f30 100644
--- a/tests/data/test-read-ctf/test7.o.abi
+++ b/tests/data/test-read-ctf/test7.o.abi
@@ -3,28 +3,28 @@
     <elf-symbol name='first_type_constructor' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr address-size='64' language='LANG_C'>
-    <class-decl name='first_type' size-in-bits='128' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-1'>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
+    <class-decl name='first_type' size-in-bits='128' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-2'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='member0' type-id='type-id-2' visibility='default'/>
+        <var-decl name='member0' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='member1' type-id='type-id-3' visibility='default'/>
+        <var-decl name='member1' type-id='type-id-4' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ctor' type-id='type-id-4' visibility='default'/>
+        <var-decl name='ctor' type-id='type-id-5' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-5'/>
     <type-decl name='unsigned char' size-in-bits='8' alignment-in-bits='8' id='type-id-6'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
     <pointer-type-def type-id='type-id-8' size-in-bits='64' alignment-in-bits='64' id='type-id-9'/>
     <function-decl name='first_type_constructor' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='first_type_constructor'>
       <parameter type-id='type-id-7'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <typedef-decl name='character' type-id='type-id-6' id='type-id-3'/>
-    <typedef-decl name='constructor' type-id='type-id-9' id='type-id-4'/>
-    <typedef-decl name='integer' type-id='type-id-5' id='type-id-2'/>
+    <typedef-decl name='character' type-id='type-id-6' id='type-id-4'/>
+    <typedef-decl name='constructor' type-id='type-id-9' id='type-id-5'/>
+    <typedef-decl name='integer' type-id='type-id-1' id='type-id-3'/>
     <type-decl name='variadic parameter type' id='type-id-11'/>
     <type-decl name='void' id='type-id-10'/>
     <function-type size-in-bits='64' alignment-in-bits='8' id='type-id-8'>
diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ctf/test9.o.abi
index 08704d79..c983d17f 100644
--- a/tests/data/test-read-ctf/test9.o.abi
+++ b/tests/data/test-read-ctf/test9.o.abi
@@ -10,48 +10,48 @@
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='infinite' alignment-in-bits='8' id='type-id-6'>
       <subrange length='infinite' type-id='type-id-4' id='type-id-7'/>
     </array-type-def>
-    <class-decl name='S' size-in-bits='2304' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-8'>
+    <type-decl name='double' size-in-bits='64' alignment-in-bits='64' id='type-id-8'/>
+    <array-type-def dimensions='1' type-id='type-id-8' size-in-bits='320' alignment-in-bits='64' id='type-id-9'>
+      <subrange length='5' type-id='type-id-4' id='type-id-10'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='960' alignment-in-bits='64' id='type-id-11'>
+      <subrange length='3' type-id='type-id-4' id='type-id-12'/>
+    </array-type-def>
+    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-13'/>
+    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='256' alignment-in-bits='64' id='type-id-15'>
+      <subrange length='4' type-id='type-id-4' id='type-id-16'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='640' alignment-in-bits='64' id='type-id-18'>
+      <subrange length='10' type-id='type-id-4' id='type-id-19'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='160' alignment-in-bits='32' id='type-id-20'>
+      <subrange length='5' type-id='type-id-4' id='type-id-10'/>
+    </array-type-def>
+    <class-decl name='S' size-in-bits='2304' alignment-in-bits='32' is-struct='yes' visibility='default' id='type-id-21'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='a' type-id='type-id-9' visibility='default'/>
+        <var-decl name='a' type-id='type-id-20' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='b' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='c' type-id='type-id-10' visibility='default'/>
+        <var-decl name='c' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='d' type-id='type-id-11' visibility='default'/>
+        <var-decl name='d' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <var-decl name='e' type-id='type-id-6' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='double' size-in-bits='64' alignment-in-bits='64' id='type-id-12'/>
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='320' alignment-in-bits='64' id='type-id-13'>
-      <subrange length='5' type-id='type-id-4' id='type-id-14'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='960' alignment-in-bits='64' id='type-id-10'>
-      <subrange length='3' type-id='type-id-4' id='type-id-15'/>
-    </array-type-def>
-    <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-16'/>
-    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='256' alignment-in-bits='64' id='type-id-18'>
-      <subrange length='4' type-id='type-id-4' id='type-id-19'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='640' alignment-in-bits='64' id='type-id-11'>
-      <subrange length='10' type-id='type-id-4' id='type-id-21'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='160' alignment-in-bits='32' id='type-id-9'>
-      <subrange length='5' type-id='type-id-4' id='type-id-14'/>
-    </array-type-def>
     <type-decl name='unsigned long int' size-in-bits='64' alignment-in-bits='64' id='type-id-4'/>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' alignment-in-bits='64' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' alignment-in-bits='64' id='type-id-22'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' alignment-in-bits='64' id='type-id-17'/>
-    <pointer-type-def type-id='type-id-18' size-in-bits='64' alignment-in-bits='64' id='type-id-20'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' alignment-in-bits='64' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' alignment-in-bits='64' id='type-id-17'/>
     <function-decl name='foo' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='foo'>
       <parameter type-id='type-id-22'/>
-      <return type-id='type-id-16'/>
+      <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
-- 
2.37.2


-- 
		Dodji