From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=+odN=35=seketeli.org=dodji@sourceware.org>
Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::227])
	by sourceware.org (Postfix) with ESMTPS id AADC53858407
	for <libabigail@sourceware.org>; Tue, 29 Nov 2022 11:46:38 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AADC53858407
Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=seketeli.org
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=seketeli.org
Received: (Authenticated sender: dodji@seketeli.org)
	by mail.gandi.net (Postfix) with ESMTPSA id 307F820008;
	Tue, 29 Nov 2022 11:46:36 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seketeli.org;
	s=gm1; t=1669722397;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=GVWH1/KR5EoijCkHnJamJeZiVpzEf+PXVZ6UKyayDUI=;
	b=odD3GoUr4Hnku5srEa/JYRxCth+dM3IoDLqF9YQcri8M9dCGx9IQ4zuYLnZOsr4HiBfevt
	aBEHyUwXBlW6Q8orYecHz1oNCbvLFze5KKHO7IA+KalalhgfrFdMOTylJ3pFlS6EqNIbNl
	kLXEtcwe0aSLy53vrRgLNTMEFVGnvjCc8vciwB44zNTOXGAbab1SS26jpsWsnGUaewcLVJ
	dO4jJzW7wpTFRLFWzXqZnBKweluig+YyX27/zGD0dxc9zV6VdBYfE/HmKEu/5DyPCqMDX7
	Dubhn/80YPLCOPIpQ7drmUdV0vQvOBPad4X3eRrpqsltwQH8MX/3OG2ylnyzqQ==
Received: by localhost (Postfix, from userid 1000)
	id 7CAA8581C59; Tue, 29 Nov 2022 12:46:36 +0100 (CET)
From: Dodji Seketeli <dodji@seketeli.org>
To: "Guillermo E. Martinez via Libabigail" <libabigail@sourceware.org>
Cc: "Guillermo E. Martinez" <guillermo.e.martinez@oracle.com>
Subject: Re: [PATCH 1/5] ctf-front-end: Set alignment-in-bits property to 0
Organization: Me, myself and I
References: <20221117034305.184864-1-guillermo.e.martinez@oracle.com>
	<20221117034305.184864-2-guillermo.e.martinez@oracle.com>
X-Operating-System: Fedora 38
X-URL: http://www.seketeli.net/~dodji
Date: Tue, 29 Nov 2022 12:46:36 +0100
In-Reply-To: <20221117034305.184864-2-guillermo.e.martinez@oracle.com>
	(Guillermo E. Martinez via Libabigail's message of "Wed, 16 Nov 2022
	21:43:01 -0600")
Message-ID: <875yeyoueb.fsf@seketeli.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_NUMSUBJECT,RCVD_IN_DNSWL_LOW,SCC_10_SHORT_WORD_LINES,SCC_20_SHORT_WORD_LINES,SCC_5_SHORT_WORD_LINES,SPF_HELO_NONE,SPF_PASS,TXREP 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 Guillermo,

"Guillermo E. Martinez via Libabigail" <libabigail@sourceware.org> a
=C3=A9crit:

> When comparing IR generated with DWARF and CTF fron-ends the report
> of different shows changes in the `alignment-in-bits' ABI XML propery:
>
> <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' id=
=3D'type-id-1'/>
> <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
>
> 1 Changed variable:
>
>   [C] 'int a' was changed at test-abi.c:8:1:
>     type of variable changed:
>       type size hasn't changed
>       type alignment changed from 32 to 0
>
> So, CTF set the alignment to `0' to base types, function
> types and struct types similarly as DWARF front-end does.

Right, this makes sense.

>
> 	* src/abg-ctf-reader.cc (process_ctf_base_type)
> 	(process_ctf_function_type, process_ctf_struct_type): Adjust
> 	`align_in_bits' argument to `0'.
> 	* tests/data/test-diff-pkg-ctf/dirpkg-3-report-1.txt: Adjust test.
> 	* tests/data/test-diff-pkg-ctf/dirpkg-3-report-2.txt: Likewise.
> 	* tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt: Likewise.
> 	* tests/data/test-read-ctf/PR27700/test-PR27700.abi: Likewise.
> 	* tests/data/test-read-ctf/test-PR26568-1.o.abi: Likewise.
> 	* 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-callback.abi: Likewise.
> 	* tests/data/test-read-ctf/test-callback2.abi: Likewise.
> 	* tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi: Like=
wise.
> 	* tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi: Like=
wise.
> 	* tests/data/test-read-ctf/test-dynamic-array.o.abi: Likewise.
> 	* tests/data/test-read-ctf/test-fallback.abi: Likewise.
> 	* tests/data/test-read-ctf/test-forward-type-decl.abi: Likewise.
> 	* tests/data/test-read-ctf/test-functions-declaration.abi: Likewise.
> 	* tests/data/test-read-ctf/test-linux-module.abi: Likewise.
> 	* tests/data/test-read-ctf/test-linux-module.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/test2.so.abi: Likewise.
> 	* tests/data/test-read-ctf/test2.so.hash.abi: Likewise.
> 	* tests/data/test-read-ctf/test3.so.abi: Likewise.
> 	* tests/data/test-read-ctf/test3.so.hash.abi: Likewise.
> 	* tests/data/test-read-ctf/test4.so.abi: Likewise.
> 	* tests/data/test-read-ctf/test4.so.hash.abi: Likewise.
> 	* tests/data/test-read-ctf/test5.o.abi: Likewise.
> 	* tests/data/test-read-ctf/test7.o.abi: Likewise.
> 	* tests/data/test-read-ctf/test8.o.abi: Likewise.
> 	* tests/data/test-read-ctf/test9.o.abi: Likewise.

OK, the patch looks good to me.  I have just slightly amended the commit
log introductory paragraphs.  Please find below the patch as applied to
master.  Thanks!

[...]

> Signed-off-by: Guillermo E. Martinez <guillermo.e.martinez@oracle.com>
> ---

[...]

Cheers,

>From 8b832a9edfadc2d99f3354555938f68a70471183 Mon Sep 17 00:00:00 2001
From: "Guillermo E. Martinez" <guillermo.e.martinez@oracle.com>
Date: Wed, 16 Nov 2022 21:43:01 -0600
Subject: [PATCH] ctf-reader: Set alignment-in-bits property to 0

When comparing the IR generated with the CTF front-end against the one
generated with the DWARF front-end, the report shows changes in type
alignments:

1 Changed variable:

  [C] 'int a' was changed at test-abi.c:8:1:
    type of variable changed:
      type size hasn't changed
      type alignment changed from 32 to 0

For the sake of consistency, this patch makes the CTF front-end set
the alignment to `0' for base types, function types and struct types
similarly to what the DWARF front-end does.

	* src/abg-ctf-reader.cc (process_ctf_base_type)
	(process_ctf_function_type, process_ctf_struct_type): Adjust
	`align_in_bits' argument to `0'.
	* tests/data/test-diff-pkg-ctf/dirpkg-3-report-1.txt: Adjust test.
	* tests/data/test-diff-pkg-ctf/dirpkg-3-report-2.txt: Likewise.
	* tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt: Likewise.
	* tests/data/test-read-ctf/PR27700/test-PR27700.abi: Likewise.
	* tests/data/test-read-ctf/test-PR26568-1.o.abi: Likewise.
	* 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-callback.abi: Likewise.
	* tests/data/test-read-ctf/test-callback2.abi: Likewise.
	* tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi: Likewi=
se.
	* tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi: Likewi=
se.
	* tests/data/test-read-ctf/test-dynamic-array.o.abi: Likewise.
	* tests/data/test-read-ctf/test-fallback.abi: Likewise.
	* tests/data/test-read-ctf/test-forward-type-decl.abi: Likewise.
	* tests/data/test-read-ctf/test-functions-declaration.abi: Likewise.
	* tests/data/test-read-ctf/test-linux-module.abi: Likewise.
	* tests/data/test-read-ctf/test-linux-module.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/test2.so.abi: Likewise.
	* tests/data/test-read-ctf/test2.so.hash.abi: Likewise.
	* tests/data/test-read-ctf/test3.so.abi: Likewise.
	* tests/data/test-read-ctf/test3.so.hash.abi: Likewise.
	* tests/data/test-read-ctf/test4.so.abi: Likewise.
	* tests/data/test-read-ctf/test4.so.hash.abi: Likewise.
	* tests/data/test-read-ctf/test5.o.abi: Likewise.
	* tests/data/test-read-ctf/test7.o.abi: Likewise.
	* tests/data/test-read-ctf/test8.o.abi: Likewise.
	* tests/data/test-read-ctf/test9.o.abi: Likewise.

Signed-off-by: Guillermo E. Martinez <guillermo.e.martinez@oracle.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-ctf-reader.cc                         |  7 +++---
 .../test-diff-pkg-ctf/dirpkg-3-report-1.txt   |  1 -
 .../test-diff-pkg-ctf/dirpkg-3-report-2.txt   |  1 -
 .../gmp-6.x.x86_64-report-0.txt               |  1 +
 .../test-read-ctf/PR27700/test-PR27700.abi    |  2 +-
 tests/data/test-read-ctf/test-PR26568-1.o.abi | 12 +++++-----
 tests/data/test-read-ctf/test-PR26568-2.o.abi | 10 ++++----
 .../test-ambiguous-struct-A.o.hash.abi        | 10 ++++----
 .../test-ambiguous-struct-B.o.hash.abi        |  6 ++---
 .../test-read-ctf/test-anonymous-fields.o.abi | 10 ++++----
 .../test-read-ctf/test-array-of-pointers.abi  | 10 ++++----
 tests/data/test-read-ctf/test-callback.abi    |  8 +++----
 tests/data/test-read-ctf/test-callback2.abi   |  6 ++---
 .../test-conflicting-type-syms-a.o.hash.abi   |  2 +-
 .../test-conflicting-type-syms-b.o.hash.abi   |  2 +-
 .../test-read-ctf/test-dynamic-array.o.abi    | 10 ++++----
 tests/data/test-read-ctf/test-fallback.abi    |  2 +-
 .../test-read-ctf/test-forward-type-decl.abi  |  6 ++---
 .../test-functions-declaration.abi            | 10 ++++----
 .../data/test-read-ctf/test-linux-module.abi  | 18 +++++++-------
 tests/data/test-read-ctf/test-list-struct.abi |  4 ++--
 tests/data/test-read-ctf/test0.abi            | 24 +++++++++----------
 tests/data/test-read-ctf/test0.hash.abi       | 24 +++++++++----------
 tests/data/test-read-ctf/test1.so.abi         |  4 ++--
 tests/data/test-read-ctf/test1.so.hash.abi    |  4 ++--
 tests/data/test-read-ctf/test2.so.abi         |  8 +++----
 tests/data/test-read-ctf/test2.so.hash.abi    |  8 +++----
 tests/data/test-read-ctf/test3.so.abi         |  2 +-
 tests/data/test-read-ctf/test3.so.hash.abi    |  2 +-
 tests/data/test-read-ctf/test4.so.abi         |  6 ++---
 tests/data/test-read-ctf/test4.so.hash.abi    |  6 ++---
 tests/data/test-read-ctf/test5.o.abi          | 18 +++++++-------
 tests/data/test-read-ctf/test7.o.abi          | 10 ++++----
 tests/data/test-read-ctf/test8.o.abi          |  2 +-
 tests/data/test-read-ctf/test9.o.abi          | 20 ++++++++--------
 35 files changed, 137 insertions(+), 139 deletions(-)

diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc
index 9bcb9424..cbc5cbca 100644
--- a/src/abg-ctf-reader.cc
+++ b/src/abg-ctf-reader.cc
@@ -783,7 +783,6 @@ process_ctf_base_type(reader *rdr,
   translation_unit_sptr tunit =3D rdr->cur_transl_unit();
   type_decl_sptr result;
=20
-  ssize_t type_alignment =3D ctf_type_align(ctf_dictionary, ctf_type);
   const char *type_name =3D ctf_type_name_raw(ctf_dictionary, ctf_type);
=20
   /* Get the type encoding and extract some useful properties of
@@ -822,7 +821,7 @@ process_ctf_base_type(reader *rdr,
         result.reset(new type_decl(rdr->env(),
                                    type_name,
                                    type_encoding.cte_bits,
-                                   type_alignment * 8 /* in bits */,
+                                   /*alignment=3D*/0,
                                    location(),
                                    type_name /* mangled_name */));
=20
@@ -929,7 +928,7 @@ process_ctf_function_type(reader *rdr,
   result.reset(new function_type(ret_type,
                                  function_parms,
                                  tunit->get_address_size(),
-                                 ctf_type_align(ctf_dictionary, ctf_type))=
);
+                                 /*alignment=3D*/0));
=20
   if (result)
     {
@@ -1087,7 +1086,7 @@ process_ctf_struct_type(reader *rdr,
   result.reset(new class_decl(rdr->env(),
                               struct_type_name,
                               ctf_type_size(ctf_dictionary, ctf_type) * 8,
-                              ctf_type_align(ctf_dictionary, ctf_type) * 8,
+                              /*alignment=3D*/0,
                               true /* is_struct */,
                               location(),
                               decl_base::VISIBILITY_DEFAULT,
diff --git a/tests/data/test-diff-pkg-ctf/dirpkg-3-report-1.txt b/tests/dat=
a/test-diff-pkg-ctf/dirpkg-3-report-1.txt
index 4938d221..aa1d7732 100644
--- a/tests/data/test-diff-pkg-ctf/dirpkg-3-report-1.txt
+++ b/tests/data/test-diff-pkg-ctf/dirpkg-3-report-1.txt
@@ -8,7 +8,6 @@
       parameter 1 of type 'S1*' has sub-type changes:
         in pointed to type 'struct S1':
           type size changed from 0 to 32 (in bits)
-          type alignment changed from 0 to 32
           1 data member insertion:
             'int mem2', at offset 0 (in bits)
=20
diff --git a/tests/data/test-diff-pkg-ctf/dirpkg-3-report-2.txt b/tests/dat=
a/test-diff-pkg-ctf/dirpkg-3-report-2.txt
index 4938d221..aa1d7732 100644
--- a/tests/data/test-diff-pkg-ctf/dirpkg-3-report-2.txt
+++ b/tests/data/test-diff-pkg-ctf/dirpkg-3-report-2.txt
@@ -8,7 +8,6 @@
       parameter 1 of type 'S1*' has sub-type changes:
         in pointed to type 'struct S1':
           type size changed from 0 to 32 (in bits)
-          type alignment changed from 0 to 32
           1 data member insertion:
             'int mem2', at offset 0 (in bits)
=20
diff --git a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt b/tes=
ts/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
index d3915f14..171d6490 100644
--- a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
@@ -133,6 +133,7 @@
                 underlying type 'const mp_limb_t*' changed:
                   entity changed from 'const mp_limb_t*' to 'unsigned long=
 int'
                   type size hasn't changed
+                  type alignment changed from 64 to 0
               parameter 2 of type 'typedef mp_size_t' changed:
                 typedef name changed from mp_size_t to mp_limb_t
                 underlying type 'long int' changed:
diff --git a/tests/data/test-read-ctf/PR27700/test-PR27700.abi b/tests/data=
/test-read-ctf/PR27700/test-PR27700.abi
index fe3a897d..4f34eb8a 100644
--- a/tests/data/test-read-ctf/PR27700/test-PR27700.abi
+++ b/tests/data/test-read-ctf/PR27700/test-PR27700.abi
@@ -12,7 +12,7 @@
       <enumerator name=3D'foo_e3' value=3D'3'/>
     </enum-decl>
     <pointer-type-def type-id=3D'022218d8' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'8750e847'/>
-    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'foo'>
+    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'foo'>
       <parameter type-id=3D'8750e847'/>
       <return type-id=3D'48b5725f'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test-PR26568-1.o.abi b/tests/data/tes=
t-read-ctf/test-PR26568-1.o.abi
index 7df180d4..60017457 100644
--- a/tests/data/test-read-ctf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-1.o.abi
@@ -3,19 +3,19 @@
     <elf-symbol name=3D'fun' type=3D'func-type' binding=3D'global-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'type-id-2'/>
-    <class-decl name=3D'A' size-in-bits=3D'64' alignment-in-bits=3D'64' is=
-struct=3D'yes' visibility=3D'default' id=3D'type-id-3'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'type-id-2'/>
+    <class-decl name=3D'A' size-in-bits=3D'64' is-struct=3D'yes' visibilit=
y=3D'default' id=3D'type-id-3'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'' type-id=3D'type-id-4' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'' size-in-bits=3D'32' alignment-in-bits=3D'32' is-=
struct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'type-id-5'>
+    <class-decl name=3D'' size-in-bits=3D'32' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'type-id-5'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'x' type-id=3D'type-id-1' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'' size-in-bits=3D'64' alignment-in-bits=3D'64' is-=
struct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'type-id-6'>
+    <class-decl name=3D'' size-in-bits=3D'64' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'type-id-6'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'y' type-id=3D'type-id-2' visibility=3D'default'/>
       </data-member>
@@ -29,7 +29,7 @@
       </data-member>
     </union-decl>
     <pointer-type-def type-id=3D'type-id-3' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-7'/>
-    <function-decl name=3D'fun' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'fun'>
+    <function-decl name=3D'fun' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'fun'>
       <parameter type-id=3D'type-id-7'/>
       <return type-id=3D'type-id-8'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test-PR26568-2.o.abi b/tests/data/tes=
t-read-ctf/test-PR26568-2.o.abi
index 44f72263..d038316a 100644
--- a/tests/data/test-read-ctf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-2.o.abi
@@ -3,14 +3,14 @@
     <elf-symbol name=3D'fun' type=3D'func-type' binding=3D'global-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'type-id-2'/>
-    <class-decl name=3D'' size-in-bits=3D'32' alignment-in-bits=3D'32' is-=
struct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'type-id-3'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'type-id-2'/>
+    <class-decl name=3D'' size-in-bits=3D'32' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'type-id-3'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'x' type-id=3D'type-id-1' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'' size-in-bits=3D'64' alignment-in-bits=3D'64' is-=
struct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'type-id-4'>
+    <class-decl name=3D'' size-in-bits=3D'64' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'type-id-4'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'y' type-id=3D'type-id-2' visibility=3D'default'/>
       </data-member>
@@ -24,7 +24,7 @@
       </data-member>
     </union-decl>
     <pointer-type-def type-id=3D'type-id-5' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-6'/>
-    <function-decl name=3D'fun' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'fun'>
+    <function-decl name=3D'fun' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'fun'>
       <parameter type-id=3D'type-id-6'/>
       <return type-id=3D'type-id-7'/>
     </function-decl>
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 91ddf181..42ce36de 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
@@ -3,11 +3,11 @@
     <elf-symbol name=3D'foo' size=3D'8' type=3D'object-type' binding=3D'gl=
obal-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <array-type-def dimensions=3D'1' type-id=3D'3ed987a4' size-in-bits=3D'=
12800' alignment-in-bits=3D'64' id=3D'e022be37'>
+    <array-type-def dimensions=3D'1' type-id=3D'3ed987a4' size-in-bits=3D'=
12800' id=3D'e022be37'>
       <subrange length=3D'50' type-id=3D'f0981eeb' id=3D'3c1860ce'/>
     </array-type-def>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'95e97e5e'/>
-    <class-decl name=3D'A' size-in-bits=3D'256' alignment-in-bits=3D'64' i=
s-struct=3D'yes' visibility=3D'default' id=3D'3ed987a4'>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'95e97e5e'/>
+    <class-decl name=3D'A' size-in-bits=3D'256' is-struct=3D'yes' visibili=
ty=3D'default' id=3D'3ed987a4'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'b' type-id=3D'41d98c5d' visibility=3D'default'/>
       </data-member>
@@ -21,13 +21,13 @@
         <var-decl name=3D'b2' type-id=3D'41d98c5d' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'B' size-in-bits=3D'64' alignment-in-bits=3D'64' is=
-struct=3D'yes' visibility=3D'default' id=3D'41d98c5d'>
+    <class-decl name=3D'B' size-in-bits=3D'64' is-struct=3D'yes' visibilit=
y=3D'default' id=3D'41d98c5d'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'a' type-id=3D'84d5ac12' visibility=3D'default'/>
       </data-member>
     </class-decl>
     <typedef-decl name=3D'a_array' type-id=3D'e022be37' id=3D'1c12b755'/>
-    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' alignment-in=
-bits=3D'64' id=3D'f0981eeb'/>
+    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' id=3D'f0981e=
eb'/>
     <pointer-type-def type-id=3D'3ed987a4' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'84d5ac12'/>
     <pointer-type-def type-id=3D'1c12b755' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'55cd64e8'/>
     <var-decl name=3D'foo' type-id=3D'55cd64e8' mangled-name=3D'foo' visib=
ility=3D'default' elf-symbol-id=3D'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 cba10afd..351483de 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,8 +3,8 @@
     <elf-symbol name=3D'a' size=3D'24' type=3D'object-type' binding=3D'glo=
bal-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'95e97e5e'/>
-    <class-decl name=3D'A' size-in-bits=3D'192' alignment-in-bits=3D'64' i=
s-struct=3D'yes' visibility=3D'default' id=3D'3ed987a4'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'95e97e5e'/>
+    <class-decl name=3D'A' size-in-bits=3D'192' is-struct=3D'yes' visibili=
ty=3D'default' id=3D'3ed987a4'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'b' type-id=3D'41d98c5d' visibility=3D'default'/>
       </data-member>
@@ -15,7 +15,7 @@
         <var-decl name=3D'b2' type-id=3D'41d98c5d' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'B' size-in-bits=3D'64' alignment-in-bits=3D'64' is=
-struct=3D'yes' visibility=3D'default' id=3D'41d98c5d'>
+    <class-decl name=3D'B' size-in-bits=3D'64' is-struct=3D'yes' visibilit=
y=3D'default' id=3D'41d98c5d'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'a' type-id=3D'84d5ac12' visibility=3D'default'/>
       </data-member>
diff --git a/tests/data/test-read-ctf/test-anonymous-fields.o.abi b/tests/d=
ata/test-read-ctf/test-anonymous-fields.o.abi
index 2df54c3b..987daa57 100644
--- a/tests/data/test-read-ctf/test-anonymous-fields.o.abi
+++ b/tests/data/test-read-ctf/test-anonymous-fields.o.abi
@@ -3,18 +3,18 @@
     <elf-symbol name=3D't' size=3D'8' type=3D'object-type' binding=3D'glob=
al-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <class-decl name=3D'uprobe_task' size-in-bits=3D'64' alignment-in-bits=
=3D'64' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-2'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <class-decl name=3D'uprobe_task' size-in-bits=3D'64' is-struct=3D'yes'=
 visibility=3D'default' id=3D'type-id-2'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'' type-id=3D'type-id-3' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'' size-in-bits=3D'32' alignment-in-bits=3D'32' is-=
struct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'type-id-4'>
+    <class-decl name=3D'' size-in-bits=3D'32' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'type-id-4'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'dup_xol_work' type-id=3D'type-id-1' visibility=
=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'' size-in-bits=3D'64' alignment-in-bits=3D'64' is-=
struct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'type-id-5'>
+    <class-decl name=3D'' size-in-bits=3D'64' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'type-id-5'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'vaddr' type-id=3D'type-id-6' visibility=3D'defau=
lt'/>
       </data-member>
@@ -27,7 +27,7 @@
         <var-decl name=3D'' type-id=3D'type-id-4' visibility=3D'default'/>
       </data-member>
     </union-decl>
-    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' alignment-in=
-bits=3D'64' id=3D'type-id-6'/>
+    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' id=3D'type-i=
d-6'/>
     <var-decl name=3D't' type-id=3D'type-id-2' mangled-name=3D't' visibili=
ty=3D'default' elf-symbol-id=3D't'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test-array-of-pointers.abi b/tests/da=
ta/test-read-ctf/test-array-of-pointers.abi
index 47135315..c521bbec 100644
--- a/tests/data/test-read-ctf/test-array-of-pointers.abi
+++ b/tests/data/test-read-ctf/test-array-of-pointers.abi
@@ -6,27 +6,27 @@
     <array-type-def dimensions=3D'1' type-id=3D'type-id-1' size-in-bits=3D=
'256' alignment-in-bits=3D'64' id=3D'type-id-2'>
       <subrange length=3D'4' type-id=3D'type-id-3' id=3D'type-id-4'/>
     </array-type-def>
-    <class-decl name=3D'cgroup' size-in-bits=3D'256' alignment-in-bits=3D'=
64' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-5'>
+    <class-decl name=3D'cgroup' size-in-bits=3D'256' is-struct=3D'yes' vis=
ibility=3D'default' id=3D'type-id-5'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D's1' type-id=3D'type-id-2' visibility=3D'default'=
/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'css_set' size-in-bits=3D'256' alignment-in-bits=3D=
'64' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-6'>
+    <class-decl name=3D'css_set' size-in-bits=3D'256' is-struct=3D'yes' vi=
sibility=3D'default' id=3D'type-id-6'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D's0' type-id=3D'type-id-2' visibility=3D'default'=
/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'state' size-in-bits=3D'64' alignment-in-bits=3D'64=
' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-7'>
+    <class-decl name=3D'state' size-in-bits=3D'64' is-struct=3D'yes' visib=
ility=3D'default' id=3D'type-id-7'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'cg' type-id=3D'type-id-8' visibility=3D'default'=
/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'task' size-in-bits=3D'64' alignment-in-bits=3D'64'=
 is-struct=3D'yes' visibility=3D'default' id=3D'type-id-9'>
+    <class-decl name=3D'task' size-in-bits=3D'64' is-struct=3D'yes' visibi=
lity=3D'default' id=3D'type-id-9'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D's' type-id=3D'type-id-10' visibility=3D'default'=
/>
       </data-member>
     </class-decl>
-    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' alignment-in=
-bits=3D'64' id=3D'type-id-3'/>
+    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' id=3D'type-i=
d-3'/>
     <pointer-type-def type-id=3D'type-id-5' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-8'/>
     <pointer-type-def type-id=3D'type-id-6' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-10'/>
     <pointer-type-def type-id=3D'type-id-7' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-1'/>
diff --git a/tests/data/test-read-ctf/test-callback.abi b/tests/data/test-r=
ead-ctf/test-callback.abi
index 7f9b6c5f..3c90e737 100644
--- a/tests/data/test-read-ctf/test-callback.abi
+++ b/tests/data/test-read-ctf/test-callback.abi
@@ -4,12 +4,12 @@
     <elf-symbol name=3D'f2' type=3D'func-type' binding=3D'global-binding' =
visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'type-id-2'/>
-    <function-decl name=3D'assign' visibility=3D'default' binding=3D'globa=
l' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'assign'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'type-id-2'/>
+    <function-decl name=3D'assign' visibility=3D'default' binding=3D'globa=
l' size-in-bits=3D'64' elf-symbol-id=3D'assign'>
       <return type-id=3D'type-id-3'/>
     </function-decl>
-    <function-decl name=3D'f2' visibility=3D'default' binding=3D'global' s=
ize-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'f2'>
+    <function-decl name=3D'f2' visibility=3D'default' binding=3D'global' s=
ize-in-bits=3D'64' elf-symbol-id=3D'f2'>
       <parameter type-id=3D'type-id-1'/>
       <parameter type-id=3D'type-id-2'/>
       <return type-id=3D'type-id-3'/>
diff --git a/tests/data/test-read-ctf/test-callback2.abi b/tests/data/test-=
read-ctf/test-callback2.abi
index c2ffdb18..87b43d06 100644
--- a/tests/data/test-read-ctf/test-callback2.abi
+++ b/tests/data/test-read-ctf/test-callback2.abi
@@ -3,8 +3,8 @@
     <elf-symbol name=3D's0' size=3D'8' type=3D'object-type' binding=3D'glo=
bal-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <class-decl name=3D's0' size-in-bits=3D'64' alignment-in-bits=3D'64' i=
s-struct=3D'yes' visibility=3D'default' id=3D'type-id-2'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <class-decl name=3D's0' size-in-bits=3D'64' is-struct=3D'yes' visibili=
ty=3D'default' id=3D'type-id-2'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'mem_fun' type-id=3D'type-id-3' visibility=3D'def=
ault'/>
       </data-member>
@@ -12,7 +12,7 @@
     <pointer-type-def type-id=3D'type-id-4' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-3'/>
     <pointer-type-def type-id=3D'type-id-2' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-5'/>
     <var-decl name=3D's0' type-id=3D'type-id-5' mangled-name=3D's0' visibi=
lity=3D'default' elf-symbol-id=3D's0'/>
-    <function-type size-in-bits=3D'64' alignment-in-bits=3D'8' id=3D'type-=
id-4'>
+    <function-type size-in-bits=3D'64' id=3D'type-id-4'>
       <parameter type-id=3D'type-id-5'/>
       <return type-id=3D'type-id-1'/>
     </function-type>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.a=
bi b/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
index 85e780a9..79079b04 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,7 +4,7 @@
     <elf-symbol name=3D'ignore2' size=3D'8' type=3D'object-type' binding=
=3D'global-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'95e97e5e'/>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'95e97e5e'/>
     <typedef-decl name=3D'a_t' type-id=3D'95e97e5e' id=3D'40acc204'/>
     <typedef-decl name=3D'b_t' type-id=3D'95e97e5e' id=3D'b3d2db81'/>
     <pointer-type-def type-id=3D'40acc204' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'c6fd4117'/>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.a=
bi b/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
index 400606dd..74b25d36 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,7 +4,7 @@
     <elf-symbol name=3D'ignore1' size=3D'8' type=3D'object-type' binding=
=3D'global-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'95e97e5e'/>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'95e97e5e'/>
     <typedef-decl name=3D'a_t' type-id=3D'95e97e5e' id=3D'40acc204'/>
     <typedef-decl name=3D'b_t' type-id=3D'95e97e5e' id=3D'b3d2db81'/>
     <var-decl name=3D'b' type-id=3D'40acc204' mangled-name=3D'b' visibilit=
y=3D'default' elf-symbol-id=3D'b'/>
diff --git a/tests/data/test-read-ctf/test-dynamic-array.o.abi b/tests/data=
/test-read-ctf/test-dynamic-array.o.abi
index a9849d49..a8978c0c 100644
--- a/tests/data/test-read-ctf/test-dynamic-array.o.abi
+++ b/tests/data/test-read-ctf/test-dynamic-array.o.abi
@@ -3,11 +3,11 @@
     <elf-symbol name=3D'use_struct_s' type=3D'func-type' binding=3D'global=
-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'char' size-in-bits=3D'8' alignment-in-bits=3D'8' id=
=3D'type-id-1'/>
-    <array-type-def dimensions=3D'1' type-id=3D'type-id-1' size-in-bits=3D=
'infinite' alignment-in-bits=3D'8' id=3D'type-id-2'>
+    <type-decl name=3D'char' size-in-bits=3D'8' id=3D'type-id-1'/>
+    <array-type-def dimensions=3D'1' type-id=3D'type-id-1' size-in-bits=3D=
'infinite' id=3D'type-id-2'>
       <subrange length=3D'infinite' type-id=3D'type-id-3' id=3D'type-id-4'=
/>
     </array-type-def>
-    <class-decl name=3D'S' size-in-bits=3D'64' alignment-in-bits=3D'64' is=
-struct=3D'yes' visibility=3D'default' id=3D'type-id-5'>
+    <class-decl name=3D'S' size-in-bits=3D'64' is-struct=3D'yes' visibilit=
y=3D'default' id=3D'type-id-5'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'a' type-id=3D'type-id-6' visibility=3D'default'/>
       </data-member>
@@ -18,10 +18,10 @@
         <var-decl name=3D'c' type-id=3D'type-id-2' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' alignment-in=
-bits=3D'64' id=3D'type-id-3'/>
+    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' id=3D'type-i=
d-3'/>
     <pointer-type-def type-id=3D'type-id-5' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-7'/>
     <pointer-type-def type-id=3D'type-id-1' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-6'/>
-    <function-decl name=3D'use_struct_s' visibility=3D'default' binding=3D=
'global' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'use_s=
truct_s'>
+    <function-decl name=3D'use_struct_s' visibility=3D'default' binding=3D=
'global' size-in-bits=3D'64' elf-symbol-id=3D'use_struct_s'>
       <parameter type-id=3D'type-id-7'/>
       <return type-id=3D'type-id-8'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test-fallback.abi b/tests/data/test-r=
ead-ctf/test-fallback.abi
index e7d30594..9f09cd56 100644
--- a/tests/data/test-read-ctf/test-fallback.abi
+++ b/tests/data/test-read-ctf/test-fallback.abi
@@ -3,7 +3,7 @@
     <elf-symbol name=3D'a' size=3D'4' type=3D'object-type' binding=3D'glob=
al-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
     <var-decl name=3D'a' type-id=3D'type-id-1' mangled-name=3D'a' visibili=
ty=3D'default' elf-symbol-id=3D'a'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-ctf/test-forward-type-decl.abi b/tests/da=
ta/test-read-ctf/test-forward-type-decl.abi
index 026e7d32..c239187b 100644
--- a/tests/data/test-read-ctf/test-forward-type-decl.abi
+++ b/tests/data/test-read-ctf/test-forward-type-decl.abi
@@ -3,7 +3,7 @@
     <elf-symbol name=3D'addr' size=3D'8' type=3D'object-type' binding=3D'g=
lobal-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <class-decl name=3D'address_space' size-in-bits=3D'128' alignment-in-b=
its=3D'64' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-1'>
+    <class-decl name=3D'address_space' size-in-bits=3D'128' is-struct=3D'y=
es' visibility=3D'default' id=3D'type-id-1'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'rb_root' type-id=3D'type-id-2' visibility=3D'def=
ault'/>
       </data-member>
@@ -11,12 +11,12 @@
         <var-decl name=3D'page' type-id=3D'type-id-3' visibility=3D'defaul=
t'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'page' size-in-bits=3D'64' alignment-in-bits=3D'64'=
 is-struct=3D'yes' visibility=3D'default' id=3D'type-id-4'>
+    <class-decl name=3D'page' size-in-bits=3D'64' is-struct=3D'yes' visibi=
lity=3D'default' id=3D'type-id-4'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'mapping' type-id=3D'type-id-5' visibility=3D'def=
ault'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'rb_node' size-in-bits=3D'64' alignment-in-bits=3D'=
64' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-6'>
+    <class-decl name=3D'rb_node' size-in-bits=3D'64' is-struct=3D'yes' vis=
ibility=3D'default' id=3D'type-id-6'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'rb_left' type-id=3D'type-id-2' visibility=3D'def=
ault'/>
       </data-member>
diff --git a/tests/data/test-read-ctf/test-functions-declaration.abi b/test=
s/data/test-read-ctf/test-functions-declaration.abi
index dd8516fd..193221e4 100644
--- a/tests/data/test-read-ctf/test-functions-declaration.abi
+++ b/tests/data/test-read-ctf/test-functions-declaration.abi
@@ -4,19 +4,19 @@
     <elf-symbol name=3D'attribute_container_device_trigger' type=3D'func-t=
ype' binding=3D'global-binding' visibility=3D'default-visibility' is-define=
d=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'type-id-2'/>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'type-id-2'/>
     <pointer-type-def type-id=3D'type-id-3' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-4'/>
-    <function-decl name=3D'attribute_container_add_device' visibility=3D'd=
efault' binding=3D'global' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-=
symbol-id=3D'attribute_container_add_device'>
+    <function-decl name=3D'attribute_container_add_device' visibility=3D'd=
efault' binding=3D'global' size-in-bits=3D'64' elf-symbol-id=3D'attribute_c=
ontainer_add_device'>
       <parameter type-id=3D'type-id-4'/>
       <return type-id=3D'type-id-5'/>
     </function-decl>
-    <function-decl name=3D'attribute_container_device_trigger' visibility=
=3D'default' binding=3D'global' size-in-bits=3D'64' alignment-in-bits=3D'8'=
 elf-symbol-id=3D'attribute_container_device_trigger'>
+    <function-decl name=3D'attribute_container_device_trigger' visibility=
=3D'default' binding=3D'global' size-in-bits=3D'64' elf-symbol-id=3D'attrib=
ute_container_device_trigger'>
       <parameter type-id=3D'type-id-4'/>
       <return type-id=3D'type-id-5'/>
     </function-decl>
     <type-decl name=3D'void' id=3D'type-id-5'/>
-    <function-type size-in-bits=3D'64' alignment-in-bits=3D'8' id=3D'type-=
id-3'>
+    <function-type size-in-bits=3D'64' id=3D'type-id-3'>
       <parameter type-id=3D'type-id-1'/>
       <parameter type-id=3D'type-id-2'/>
       <return type-id=3D'type-id-5'/>
diff --git a/tests/data/test-read-ctf/test-linux-module.abi b/tests/data/te=
st-read-ctf/test-linux-module.abi
index e8081f16..933b9f82 100644
--- a/tests/data/test-read-ctf/test-linux-module.abi
+++ b/tests/data/test-read-ctf/test-linux-module.abi
@@ -7,8 +7,8 @@
     <elf-symbol name=3D'global_sym' size=3D'4' type=3D'object-type' bindin=
g=3D'global-binding' visibility=3D'default-visibility' is-defined=3D'yes' c=
rc=3D'0x44a6713b'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <class-decl name=3D'__raw_tickets' size-in-bits=3D'32' alignment-in-bi=
ts=3D'16' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-2'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <class-decl name=3D'__raw_tickets' size-in-bits=3D'32' is-struct=3D'ye=
s' visibility=3D'default' id=3D'type-id-2'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'owner' type-id=3D'type-id-3' visibility=3D'defau=
lt'/>
       </data-member>
@@ -16,17 +16,17 @@
         <var-decl name=3D'next' type-id=3D'type-id-3' visibility=3D'defaul=
t'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'arch_spinlock_t' size-in-bits=3D'32' alignment-in-=
bits=3D'32' is-struct=3D'yes' naming-typedef-id=3D'type-id-4' visibility=3D=
'default' id=3D'type-id-5'>
+    <class-decl name=3D'arch_spinlock_t' size-in-bits=3D'32' is-struct=3D'=
yes' naming-typedef-id=3D'type-id-4' visibility=3D'default' id=3D'type-id-5=
'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'' type-id=3D'type-id-6' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'raw_spinlock' size-in-bits=3D'32' alignment-in-bit=
s=3D'32' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-7'>
+    <class-decl name=3D'raw_spinlock' size-in-bits=3D'32' is-struct=3D'yes=
' visibility=3D'default' id=3D'type-id-7'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'raw_lock' type-id=3D'type-id-4' visibility=3D'de=
fault'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'spinlock' size-in-bits=3D'32' alignment-in-bits=3D=
'32' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-8'>
+    <class-decl name=3D'spinlock' size-in-bits=3D'32' is-struct=3D'yes' vi=
sibility=3D'default' id=3D'type-id-8'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'' type-id=3D'type-id-9' visibility=3D'default'/>
       </data-member>
@@ -50,13 +50,13 @@
         <var-decl name=3D'tickets' type-id=3D'type-id-2' visibility=3D'def=
ault'/>
       </data-member>
     </union-decl>
-    <type-decl name=3D'unsigned int' size-in-bits=3D'32' alignment-in-bits=
=3D'32' id=3D'type-id-12'/>
-    <type-decl name=3D'unsigned short int' size-in-bits=3D'16' alignment-i=
n-bits=3D'16' id=3D'type-id-10'/>
+    <type-decl name=3D'unsigned int' size-in-bits=3D'32' id=3D'type-id-12'=
/>
+    <type-decl name=3D'unsigned short int' size-in-bits=3D'16' id=3D'type-=
id-10'/>
     <pointer-type-def type-id=3D'type-id-14' size-in-bits=3D'64' alignment=
-in-bits=3D'64' id=3D'type-id-16'/>
-    <function-decl name=3D'testexport' visibility=3D'default' binding=3D'g=
lobal' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'testexp=
ort'>
+    <function-decl name=3D'testexport' visibility=3D'default' binding=3D'g=
lobal' size-in-bits=3D'64' elf-symbol-id=3D'testexport'>
       <return type-id=3D'type-id-1'/>
     </function-decl>
-    <function-decl name=3D'testexport2' visibility=3D'default' binding=3D'=
global' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'testex=
port2'>
+    <function-decl name=3D'testexport2' visibility=3D'default' binding=3D'=
global' size-in-bits=3D'64' elf-symbol-id=3D'testexport2'>
       <parameter type-id=3D'type-id-16'/>
       <return type-id=3D'type-id-1'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test-list-struct.abi b/tests/data/tes=
t-read-ctf/test-list-struct.abi
index ecd4d08b..3fdc6aec 100644
--- a/tests/data/test-read-ctf/test-list-struct.abi
+++ b/tests/data/test-read-ctf/test-list-struct.abi
@@ -4,8 +4,8 @@
     <elf-symbol name=3D'n2' size=3D'16' type=3D'object-type' binding=3D'gl=
obal-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <class-decl name=3D'rb_node_b' size-in-bits=3D'128' alignment-in-bits=
=3D'64' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-2'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <class-decl name=3D'rb_node_b' size-in-bits=3D'128' is-struct=3D'yes' =
visibility=3D'default' id=3D'type-id-2'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'this' type-id=3D'type-id-3' visibility=3D'defaul=
t'/>
       </data-member>
diff --git a/tests/data/test-read-ctf/test0.abi b/tests/data/test-read-ctf/=
test0.abi
index 2129de41..05430067 100644
--- a/tests/data/test-read-ctf/test0.abi
+++ b/tests/data/test-read-ctf/test0.abi
@@ -20,21 +20,21 @@
     <elf-symbol name=3D'test_volatile' size=3D'2' type=3D'object-type' bin=
ding=3D'global-binding' visibility=3D'default-visibility' is-defined=3D'yes=
'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'' is-anonymous=3D'yes' size-in-bits=3D'1' alignment=
-in-bits=3D'8' id=3D'type-id-1'/>
-    <type-decl name=3D'char' size-in-bits=3D'8' alignment-in-bits=3D'8' id=
=3D'type-id-2'/>
-    <type-decl name=3D'float' size-in-bits=3D'32' alignment-in-bits=3D'32'=
 id=3D'type-id-3'/>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-4'/>
-    <array-type-def dimensions=3D'1' type-id=3D'type-id-4' size-in-bits=3D=
'320' alignment-in-bits=3D'32' id=3D'type-id-5'>
+    <type-decl name=3D'' is-anonymous=3D'yes' size-in-bits=3D'1' id=3D'typ=
e-id-1'/>
+    <type-decl name=3D'char' size-in-bits=3D'8' id=3D'type-id-2'/>
+    <type-decl name=3D'float' size-in-bits=3D'32' id=3D'type-id-3'/>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-4'/>
+    <array-type-def dimensions=3D'1' type-id=3D'type-id-4' size-in-bits=3D=
'320' id=3D'type-id-5'>
       <subrange length=3D'10' type-id=3D'type-id-6' id=3D'type-id-7'/>
     </array-type-def>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'type-id-8'/>
-    <type-decl name=3D'short int' size-in-bits=3D'16' alignment-in-bits=3D=
'16' id=3D'type-id-9'/>
-    <class-decl name=3D'S' size-in-bits=3D'32' alignment-in-bits=3D'32' is=
-struct=3D'yes' visibility=3D'default' id=3D'type-id-10'>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'type-id-8'/>
+    <type-decl name=3D'short int' size-in-bits=3D'16' id=3D'type-id-9'/>
+    <class-decl name=3D'S' size-in-bits=3D'32' is-struct=3D'yes' visibilit=
y=3D'default' id=3D'type-id-10'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'type-id-4' visibility=3D'default'=
/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'' size-in-bits=3D'32' alignment-in-bits=3D'8' is-s=
truct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'type-id-11'>
+    <class-decl name=3D'' size-in-bits=3D'32' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'type-id-11'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'status0' type-id=3D'type-id-1' visibility=3D'def=
ault'/>
       </data-member>
@@ -42,7 +42,7 @@
         <var-decl name=3D'status1' type-id=3D'type-id-1' visibility=3D'def=
ault'/>
       </data-member>
     </class-decl>
-    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' alignment-in=
-bits=3D'64' id=3D'type-id-6'/>
+    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' id=3D'type-i=
d-6'/>
     <pointer-type-def type-id=3D'type-id-10' size-in-bits=3D'64' alignment=
-in-bits=3D'64' id=3D'type-id-12'/>
     <pointer-type-def type-id=3D'type-id-2' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-13'/>
     <qualified-type-def type-id=3D'type-id-10' const=3D'yes' id=3D'type-id=
-14'/>
@@ -53,11 +53,11 @@
     <var-decl name=3D'test_pointer' type-id=3D'type-id-13' mangled-name=3D=
'test_pointer' visibility=3D'default' elf-symbol-id=3D'test_pointer'/>
     <var-decl name=3D'test_const' type-id=3D'type-id-14' mangled-name=3D't=
est_const' visibility=3D'default' elf-symbol-id=3D'test_const'/>
     <var-decl name=3D'test_float' type-id=3D'type-id-3' mangled-name=3D'te=
st_float' visibility=3D'default' elf-symbol-id=3D'test_float'/>
-    <function-decl name=3D'foo_1' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'foo_1'>
+    <function-decl name=3D'foo_1' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' elf-symbol-id=3D'foo_1'>
       <parameter type-id=3D'type-id-12'/>
       <return type-id=3D'type-id-4'/>
     </function-decl>
-    <function-decl name=3D'main' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'main'>
+    <function-decl name=3D'main' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' elf-symbol-id=3D'main'>
       <return type-id=3D'type-id-4'/>
     </function-decl>
     <var-decl name=3D'test_array' type-id=3D'type-id-5' mangled-name=3D'te=
st_array' visibility=3D'default' elf-symbol-id=3D'test_array'/>
diff --git a/tests/data/test-read-ctf/test0.hash.abi b/tests/data/test-read=
-ctf/test0.hash.abi
index e98c97db..4aa9a93c 100644
--- a/tests/data/test-read-ctf/test0.hash.abi
+++ b/tests/data/test-read-ctf/test0.hash.abi
@@ -20,21 +20,21 @@
     <elf-symbol name=3D'test_volatile' size=3D'2' type=3D'object-type' bin=
ding=3D'global-binding' visibility=3D'default-visibility' is-defined=3D'yes=
'/>
   </elf-variable-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'' is-anonymous=3D'yes' size-in-bits=3D'1' alignment=
-in-bits=3D'8' id=3D'811c9dc5'/>
-    <type-decl name=3D'char' size-in-bits=3D'8' alignment-in-bits=3D'8' id=
=3D'a84c031d'/>
-    <type-decl name=3D'float' size-in-bits=3D'32' alignment-in-bits=3D'32'=
 id=3D'a6c45d85'/>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'95e97e5e'/>
-    <array-type-def dimensions=3D'1' type-id=3D'95e97e5e' size-in-bits=3D'=
320' alignment-in-bits=3D'32' id=3D'b7bd1749'>
+    <type-decl name=3D'' is-anonymous=3D'yes' size-in-bits=3D'1' id=3D'811=
c9dc5'/>
+    <type-decl name=3D'char' size-in-bits=3D'8' id=3D'a84c031d'/>
+    <type-decl name=3D'float' size-in-bits=3D'32' id=3D'a6c45d85'/>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'95e97e5e'/>
+    <array-type-def dimensions=3D'1' type-id=3D'95e97e5e' size-in-bits=3D'=
320' id=3D'b7bd1749'>
       <subrange length=3D'10' type-id=3D'f0981eeb' id=3D'487da03a'/>
     </array-type-def>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'95e97e5f'/>
-    <type-decl name=3D'short int' size-in-bits=3D'16' alignment-in-bits=3D=
'16' id=3D'95e97e60'/>
-    <class-decl name=3D'S' size-in-bits=3D'32' alignment-in-bits=3D'32' is=
-struct=3D'yes' visibility=3D'default' id=3D'50d9a3fa'>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'95e97e5f'/>
+    <type-decl name=3D'short int' size-in-bits=3D'16' id=3D'95e97e60'/>
+    <class-decl name=3D'S' size-in-bits=3D'32' is-struct=3D'yes' visibilit=
y=3D'default' id=3D'50d9a3fa'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'95e97e5e' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'' size-in-bits=3D'32' alignment-in-bits=3D'8' is-s=
truct=3D'yes' is-anonymous=3D'yes' visibility=3D'default' id=3D'b91ffdee'>
+    <class-decl name=3D'' size-in-bits=3D'32' is-struct=3D'yes' is-anonymo=
us=3D'yes' visibility=3D'default' id=3D'b91ffdee'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'status0' type-id=3D'811c9dc5' visibility=3D'defa=
ult'/>
       </data-member>
@@ -42,7 +42,7 @@
         <var-decl name=3D'status1' type-id=3D'811c9dc5' visibility=3D'defa=
ult'/>
       </data-member>
     </class-decl>
-    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' alignment-in=
-bits=3D'64' id=3D'f0981eeb'/>
+    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' id=3D'f0981e=
eb'/>
     <pointer-type-def type-id=3D'50d9a3fa' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'fd01f598'/>
     <pointer-type-def type-id=3D'a84c031d' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'26a90f95'/>
     <qualified-type-def type-id=3D'50d9a3fa' const=3D'yes' id=3D'0fb3b55d'=
/>
@@ -53,11 +53,11 @@
     <var-decl name=3D'test_pointer' type-id=3D'26a90f95' mangled-name=3D't=
est_pointer' visibility=3D'default' elf-symbol-id=3D'test_pointer'/>
     <var-decl name=3D'test_const' type-id=3D'0fb3b55d' mangled-name=3D'tes=
t_const' visibility=3D'default' elf-symbol-id=3D'test_const'/>
     <var-decl name=3D'test_float' type-id=3D'a6c45d85' mangled-name=3D'tes=
t_float' visibility=3D'default' elf-symbol-id=3D'test_float'/>
-    <function-decl name=3D'foo_1' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'foo_1'>
+    <function-decl name=3D'foo_1' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' elf-symbol-id=3D'foo_1'>
       <parameter type-id=3D'fd01f598'/>
       <return type-id=3D'95e97e5e'/>
     </function-decl>
-    <function-decl name=3D'main' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'main'>
+    <function-decl name=3D'main' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' elf-symbol-id=3D'main'>
       <return type-id=3D'95e97e5e'/>
     </function-decl>
     <var-decl name=3D'test_array' type-id=3D'b7bd1749' mangled-name=3D'tes=
t_array' visibility=3D'default' elf-symbol-id=3D'test_array'/>
diff --git a/tests/data/test-read-ctf/test1.so.abi b/tests/data/test-read-c=
tf/test1.so.abi
index 4d0895a3..822b57a5 100644
--- a/tests/data/test-read-ctf/test1.so.abi
+++ b/tests/data/test-read-ctf/test1.so.abi
@@ -12,7 +12,7 @@
       <enumerator name=3D'e0' value=3D'0'/>
       <enumerator name=3D'e1' value=3D'1'/>
     </enum-decl>
-    <class-decl name=3D'opaque_struct' size-in-bits=3D'32' alignment-in-bi=
ts=3D'32' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-3'>
+    <class-decl name=3D'opaque_struct' size-in-bits=3D'32' is-struct=3D'ye=
s' visibility=3D'default' id=3D'type-id-3'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'type-id-4' visibility=3D'default'=
/>
       </data-member>
@@ -21,7 +21,7 @@
     <typedef-decl name=3D'opaque_struct' type-id=3D'type-id-3' id=3D'type-=
id-5'/>
     <pointer-type-def type-id=3D'type-id-4' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-6'/>
     <pointer-type-def type-id=3D'type-id-5' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-7'/>
-    <function-decl name=3D'fn' visibility=3D'default' binding=3D'global' s=
ize-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'fn'>
+    <function-decl name=3D'fn' visibility=3D'default' binding=3D'global' s=
ize-in-bits=3D'64' elf-symbol-id=3D'fn'>
       <parameter type-id=3D'type-id-7'/>
       <parameter type-id=3D'type-id-6'/>
       <return type-id=3D'type-id-8'/>
diff --git a/tests/data/test-read-ctf/test1.so.hash.abi b/tests/data/test-r=
ead-ctf/test1.so.hash.abi
index 89bbb528..b3ace158 100644
--- a/tests/data/test-read-ctf/test1.so.hash.abi
+++ b/tests/data/test-read-ctf/test1.so.hash.abi
@@ -12,7 +12,7 @@
       <enumerator name=3D'e0' value=3D'0'/>
       <enumerator name=3D'e1' value=3D'1'/>
     </enum-decl>
-    <class-decl name=3D'opaque_struct' size-in-bits=3D'32' alignment-in-bi=
ts=3D'32' is-struct=3D'yes' visibility=3D'default' id=3D'6cde5052'>
+    <class-decl name=3D'opaque_struct' size-in-bits=3D'32' is-struct=3D'ye=
s' visibility=3D'default' id=3D'6cde5052'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'99fcd3a5' visibility=3D'default'/>
       </data-member>
@@ -21,7 +21,7 @@
     <typedef-decl name=3D'opaque_struct' type-id=3D'6cde5052' id=3D'dae69c=
a1'/>
     <pointer-type-def type-id=3D'99fcd3a5' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'0e0526e0'/>
     <pointer-type-def type-id=3D'dae69ca1' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'3f6e71d0'/>
-    <function-decl name=3D'fn' visibility=3D'default' binding=3D'global' s=
ize-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'fn'>
+    <function-decl name=3D'fn' visibility=3D'default' binding=3D'global' s=
ize-in-bits=3D'64' elf-symbol-id=3D'fn'>
       <parameter type-id=3D'3f6e71d0'/>
       <parameter type-id=3D'0e0526e0'/>
       <return type-id=3D'48b5725f'/>
diff --git a/tests/data/test-read-ctf/test2.so.abi b/tests/data/test-read-c=
tf/test2.so.abi
index 53001972..f2fb069d 100644
--- a/tests/data/test-read-ctf/test2.so.abi
+++ b/tests/data/test-read-ctf/test2.so.abi
@@ -7,12 +7,12 @@
     <elf-symbol name=3D'foo' type=3D'func-type' binding=3D'global-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <class-decl name=3D'S0' size-in-bits=3D'64' alignment-in-bits=3D'64' i=
s-struct=3D'yes' visibility=3D'default' id=3D'type-id-1'>
+    <class-decl name=3D'S0' size-in-bits=3D'64' is-struct=3D'yes' visibili=
ty=3D'default' id=3D'type-id-1'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'type-id-2' visibility=3D'default'=
/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'S1' size-in-bits=3D'64' alignment-in-bits=3D'64' i=
s-struct=3D'yes' visibility=3D'default' id=3D'type-id-3'>
+    <class-decl name=3D'S1' size-in-bits=3D'64' is-struct=3D'yes' visibili=
ty=3D'default' id=3D'type-id-3'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'type-id-4' visibility=3D'default'=
/>
       </data-member>
@@ -23,11 +23,11 @@
     <qualified-type-def type-id=3D'type-id-8' const=3D'yes' id=3D'type-id-=
9'/>
     <pointer-type-def type-id=3D'type-id-9' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-5'/>
     <pointer-type-def type-id=3D'type-id-8' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-2'/>
-    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'bar'>
+    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'bar'>
       <parameter type-id=3D'type-id-7'/>
       <return type-id=3D'type-id-8'/>
     </function-decl>
-    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'foo'>
+    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'foo'>
       <parameter type-id=3D'type-id-6'/>
       <return type-id=3D'type-id-8'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test2.so.hash.abi b/tests/data/test-r=
ead-ctf/test2.so.hash.abi
index 84fcaa96..1efd533a 100644
--- a/tests/data/test-read-ctf/test2.so.hash.abi
+++ b/tests/data/test-read-ctf/test2.so.hash.abi
@@ -7,12 +7,12 @@
     <elf-symbol name=3D'foo' type=3D'func-type' binding=3D'global-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <class-decl name=3D'S0' size-in-bits=3D'64' alignment-in-bits=3D'64' i=
s-struct=3D'yes' visibility=3D'default' id=3D'109cd6fe'>
+    <class-decl name=3D'S0' size-in-bits=3D'64' is-struct=3D'yes' visibili=
ty=3D'default' id=3D'109cd6fe'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'eaa32e2f' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <class-decl name=3D'S1' size-in-bits=3D'64' alignment-in-bits=3D'64' i=
s-struct=3D'yes' visibility=3D'default' id=3D'119cd891'>
+    <class-decl name=3D'S1' size-in-bits=3D'64' is-struct=3D'yes' visibili=
ty=3D'default' id=3D'119cd891'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'm0' type-id=3D'8a34a235' visibility=3D'default'/>
       </data-member>
@@ -23,11 +23,11 @@
     <qualified-type-def type-id=3D'48b5725f' const=3D'yes' id=3D'8581546e'=
/>
     <pointer-type-def type-id=3D'8581546e' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'6e97a70c'/>
     <pointer-type-def type-id=3D'48b5725f' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'eaa32e2f'/>
-    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'bar'>
+    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'bar'>
       <parameter type-id=3D'5e30a4f9'/>
       <return type-id=3D'48b5725f'/>
     </function-decl>
-    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'foo'>
+    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'foo'>
       <parameter type-id=3D'842ea234'/>
       <return type-id=3D'48b5725f'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test3.so.abi b/tests/data/test-read-c=
tf/test3.so.abi
index 25fe7685..8e2492f3 100644
--- a/tests/data/test-read-ctf/test3.so.abi
+++ b/tests/data/test-read-ctf/test3.so.abi
@@ -11,7 +11,7 @@
     <elf-symbol name=3D'foo__' type=3D'func-type' binding=3D'weak-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <function-decl name=3D'__foo' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'__foo'>
+    <function-decl name=3D'__foo' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' elf-symbol-id=3D'__foo'>
       <return type-id=3D'type-id-1'/>
     </function-decl>
     <type-decl name=3D'void' id=3D'type-id-1'/>
diff --git a/tests/data/test-read-ctf/test3.so.hash.abi b/tests/data/test-r=
ead-ctf/test3.so.hash.abi
index 07dd9601..f991d33a 100644
--- a/tests/data/test-read-ctf/test3.so.hash.abi
+++ b/tests/data/test-read-ctf/test3.so.hash.abi
@@ -11,7 +11,7 @@
     <elf-symbol name=3D'foo__' type=3D'func-type' binding=3D'weak-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <function-decl name=3D'__foo' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'__foo'>
+    <function-decl name=3D'__foo' visibility=3D'default' binding=3D'global=
' size-in-bits=3D'64' elf-symbol-id=3D'__foo'>
       <return type-id=3D'48b5725f'/>
     </function-decl>
     <type-decl name=3D'void' id=3D'48b5725f'/>
diff --git a/tests/data/test-read-ctf/test4.so.abi b/tests/data/test-read-c=
tf/test4.so.abi
index 21241d30..9f4e9255 100644
--- a/tests/data/test-read-ctf/test4.so.abi
+++ b/tests/data/test-read-ctf/test4.so.abi
@@ -6,14 +6,14 @@
     <elf-symbol name=3D'cpy' type=3D'func-type' binding=3D'global-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'char' size-in-bits=3D'8' alignment-in-bits=3D'8' id=
=3D'type-id-1'/>
-    <type-decl name=3D'unsigned int' size-in-bits=3D'32' alignment-in-bits=
=3D'32' id=3D'type-id-2'/>
+    <type-decl name=3D'char' size-in-bits=3D'8' id=3D'type-id-1'/>
+    <type-decl name=3D'unsigned int' size-in-bits=3D'32' id=3D'type-id-2'/>
     <pointer-type-def type-id=3D'type-id-1' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-3'/>
     <qualified-type-def type-id=3D'type-id-3' restrict=3D'yes' id=3D'type-=
id-4'/>
     <qualified-type-def type-id=3D'type-id-1' const=3D'yes' id=3D'type-id-=
5'/>
     <pointer-type-def type-id=3D'type-id-5' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-6'/>
     <qualified-type-def type-id=3D'type-id-6' restrict=3D'yes' id=3D'type-=
id-7'/>
-    <function-decl name=3D'cpy' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'cpy'>
+    <function-decl name=3D'cpy' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'cpy'>
       <parameter type-id=3D'type-id-4'/>
       <parameter type-id=3D'type-id-7'/>
       <parameter type-id=3D'type-id-2'/>
diff --git a/tests/data/test-read-ctf/test4.so.hash.abi b/tests/data/test-r=
ead-ctf/test4.so.hash.abi
index 40ab7069..1e952c75 100644
--- a/tests/data/test-read-ctf/test4.so.hash.abi
+++ b/tests/data/test-read-ctf/test4.so.hash.abi
@@ -6,14 +6,14 @@
     <elf-symbol name=3D'cpy' type=3D'func-type' binding=3D'global-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'char' size-in-bits=3D'8' alignment-in-bits=3D'8' id=
=3D'a84c031d'/>
-    <type-decl name=3D'unsigned int' size-in-bits=3D'32' alignment-in-bits=
=3D'32' id=3D'f0981eeb'/>
+    <type-decl name=3D'char' size-in-bits=3D'8' id=3D'a84c031d'/>
+    <type-decl name=3D'unsigned int' size-in-bits=3D'32' id=3D'f0981eeb'/>
     <pointer-type-def type-id=3D'a84c031d' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'26a90f95'/>
     <qualified-type-def type-id=3D'26a90f95' restrict=3D'yes' id=3D'266fe2=
97'/>
     <qualified-type-def type-id=3D'a84c031d' const=3D'yes' id=3D'9b45d938'=
/>
     <pointer-type-def type-id=3D'9b45d938' size-in-bits=3D'64' alignment-i=
n-bits=3D'64' id=3D'80f4b756'/>
     <qualified-type-def type-id=3D'80f4b756' restrict=3D'yes' id=3D'9d2608=
9a'/>
-    <function-decl name=3D'cpy' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'cpy'>
+    <function-decl name=3D'cpy' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'cpy'>
       <parameter type-id=3D'266fe297'/>
       <parameter type-id=3D'9d26089a'/>
       <parameter type-id=3D'f0981eeb'/>
diff --git a/tests/data/test-read-ctf/test5.o.abi b/tests/data/test-read-ct=
f/test5.o.abi
index 84eb34d7..6d72d7ab 100644
--- a/tests/data/test-read-ctf/test5.o.abi
+++ b/tests/data/test-read-ctf/test5.o.abi
@@ -8,39 +8,39 @@
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
     <type-decl name=3D'' is-anonymous=3D'yes' size-in-bits=3D'32' alignmen=
t-in-bits=3D'32' id=3D'type-id-1'/>
-    <type-decl name=3D'char' size-in-bits=3D'8' alignment-in-bits=3D'8' id=
=3D'type-id-2'/>
+    <type-decl name=3D'char' size-in-bits=3D'8' id=3D'type-id-2'/>
     <enum-decl name=3D'E' linkage-name=3D'E' id=3D'type-id-3'>
       <underlying-type type-id=3D'type-id-1'/>
       <enumerator name=3D'e0' value=3D'0'/>
       <enumerator name=3D'e1' value=3D'1'/>
     </enum-decl>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-4'/>
-    <type-decl name=3D'long int' size-in-bits=3D'64' alignment-in-bits=3D'=
64' id=3D'type-id-5'/>
-    <type-decl name=3D'long long int' size-in-bits=3D'64' alignment-in-bit=
s=3D'64' id=3D'type-id-6'/>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-4'/>
+    <type-decl name=3D'long int' size-in-bits=3D'64' id=3D'type-id-5'/>
+    <type-decl name=3D'long long int' size-in-bits=3D'64' id=3D'type-id-6'=
/>
     <typedef-decl name=3D'long_long' type-id=3D'type-id-6' id=3D'type-id-7=
'/>
     <pointer-type-def type-id=3D'type-id-2' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-8'/>
     <qualified-type-def type-id=3D'type-id-4' const=3D'yes' id=3D'type-id-=
9'/>
     <qualified-type-def type-id=3D'type-id-5' const=3D'yes' id=3D'type-id-=
10'/>
     <qualified-type-def type-id=3D'type-id-10' volatile=3D'yes' id=3D'type=
-id-11'/>
-    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'foo'>
+    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'foo'>
       <parameter type-id=3D'type-id-8'/>
       <parameter type-id=3D'type-id-11'/>
       <return type-id=3D'type-id-5'/>
     </function-decl>
-    <function-decl name=3D'baz2' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'baz2'>
+    <function-decl name=3D'baz2' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' elf-symbol-id=3D'baz2'>
       <parameter type-id=3D'type-id-4'/>
       <return type-id=3D'type-id-7'/>
     </function-decl>
-    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'bar'>
+    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'bar'>
       <parameter type-id=3D'type-id-9'/>
       <parameter is-variadic=3D'yes'/>
       <return type-id=3D'type-id-12'/>
     </function-decl>
-    <function-decl name=3D'bar2' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'bar2'>
+    <function-decl name=3D'bar2' visibility=3D'default' binding=3D'global'=
 size-in-bits=3D'64' elf-symbol-id=3D'bar2'>
       <parameter type-id=3D'type-id-3'/>
       <return type-id=3D'type-id-12'/>
     </function-decl>
-    <function-decl name=3D'baz' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'baz'>
+    <function-decl name=3D'baz' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'baz'>
       <parameter type-id=3D'type-id-4'/>
       <return type-id=3D'type-id-12'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test7.o.abi b/tests/data/test-read-ct=
f/test7.o.abi
index 85468e11..65371cf5 100644
--- a/tests/data/test-read-ctf/test7.o.abi
+++ b/tests/data/test-read-ctf/test7.o.abi
@@ -3,8 +3,8 @@
     <elf-symbol name=3D'first_type_constructor' type=3D'func-type' binding=
=3D'global-binding' visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-1'/>
-    <class-decl name=3D'first_type' size-in-bits=3D'128' alignment-in-bits=
=3D'32' is-struct=3D'yes' visibility=3D'default' id=3D'type-id-2'>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-1'/>
+    <class-decl name=3D'first_type' size-in-bits=3D'128' is-struct=3D'yes'=
 visibility=3D'default' id=3D'type-id-2'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'member0' type-id=3D'type-id-3' visibility=3D'def=
ault'/>
       </data-member>
@@ -18,16 +18,16 @@
     <typedef-decl name=3D'character' type-id=3D'type-id-6' id=3D'type-id-4=
'/>
     <typedef-decl name=3D'constructor' type-id=3D'type-id-7' id=3D'type-id=
-5'/>
     <typedef-decl name=3D'integer' type-id=3D'type-id-1' id=3D'type-id-3'/>
-    <type-decl name=3D'unsigned char' size-in-bits=3D'8' alignment-in-bits=
=3D'8' id=3D'type-id-6'/>
+    <type-decl name=3D'unsigned char' size-in-bits=3D'8' id=3D'type-id-6'/>
     <pointer-type-def type-id=3D'type-id-2' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-8'/>
     <pointer-type-def type-id=3D'type-id-9' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-7'/>
-    <function-decl name=3D'first_type_constructor' visibility=3D'default' =
binding=3D'global' size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-i=
d=3D'first_type_constructor'>
+    <function-decl name=3D'first_type_constructor' visibility=3D'default' =
binding=3D'global' size-in-bits=3D'64' elf-symbol-id=3D'first_type_construc=
tor'>
       <parameter type-id=3D'type-id-8'/>
       <return type-id=3D'type-id-10'/>
     </function-decl>
     <type-decl name=3D'variadic parameter type' id=3D'type-id-11'/>
     <type-decl name=3D'void' id=3D'type-id-10'/>
-    <function-type size-in-bits=3D'64' alignment-in-bits=3D'8' id=3D'type-=
id-9'>
+    <function-type size-in-bits=3D'64' id=3D'type-id-9'>
       <parameter is-variadic=3D'yes'/>
       <return type-id=3D'type-id-10'/>
     </function-type>
diff --git a/tests/data/test-read-ctf/test8.o.abi b/tests/data/test-read-ct=
f/test8.o.abi
index b6996c29..430bc128 100644
--- a/tests/data/test-read-ctf/test8.o.abi
+++ b/tests/data/test-read-ctf/test8.o.abi
@@ -4,7 +4,7 @@
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
     <pointer-type-def type-id=3D'type-id-1' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-2'/>
-    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'bar'>
+    <function-decl name=3D'bar' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'bar'>
       <parameter type-id=3D'type-id-2'/>
       <return type-id=3D'type-id-1'/>
     </function-decl>
diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ct=
f/test9.o.abi
index c983d17f..331bfc70 100644
--- a/tests/data/test-read-ctf/test9.o.abi
+++ b/tests/data/test-read-ctf/test9.o.abi
@@ -3,31 +3,31 @@
     <elf-symbol name=3D'foo' type=3D'func-type' binding=3D'global-binding'=
 visibility=3D'default-visibility' is-defined=3D'yes'/>
   </elf-function-symbols>
   <abi-instr address-size=3D'64' language=3D'LANG_C'>
-    <type-decl name=3D'char' size-in-bits=3D'8' alignment-in-bits=3D'8' id=
=3D'type-id-1'/>
+    <type-decl name=3D'char' size-in-bits=3D'8' id=3D'type-id-1'/>
     <array-type-def dimensions=3D'1' type-id=3D'type-id-2' size-in-bits=3D=
'448' alignment-in-bits=3D'64' id=3D'type-id-3'>
       <subrange length=3D'7' type-id=3D'type-id-4' id=3D'type-id-5'/>
     </array-type-def>
-    <array-type-def dimensions=3D'1' type-id=3D'type-id-1' size-in-bits=3D=
'infinite' alignment-in-bits=3D'8' id=3D'type-id-6'>
+    <array-type-def dimensions=3D'1' type-id=3D'type-id-1' size-in-bits=3D=
'infinite' id=3D'type-id-6'>
       <subrange length=3D'infinite' type-id=3D'type-id-4' id=3D'type-id-7'=
/>
     </array-type-def>
-    <type-decl name=3D'double' size-in-bits=3D'64' alignment-in-bits=3D'64=
' id=3D'type-id-8'/>
-    <array-type-def dimensions=3D'1' type-id=3D'type-id-8' size-in-bits=3D=
'320' alignment-in-bits=3D'64' id=3D'type-id-9'>
+    <type-decl name=3D'double' size-in-bits=3D'64' id=3D'type-id-8'/>
+    <array-type-def dimensions=3D'1' type-id=3D'type-id-8' size-in-bits=3D=
'320' id=3D'type-id-9'>
       <subrange length=3D'5' type-id=3D'type-id-4' id=3D'type-id-10'/>
     </array-type-def>
-    <array-type-def dimensions=3D'1' type-id=3D'type-id-9' size-in-bits=3D=
'960' alignment-in-bits=3D'64' id=3D'type-id-11'>
+    <array-type-def dimensions=3D'1' type-id=3D'type-id-9' size-in-bits=3D=
'960' id=3D'type-id-11'>
       <subrange length=3D'3' type-id=3D'type-id-4' id=3D'type-id-12'/>
     </array-type-def>
-    <type-decl name=3D'int' size-in-bits=3D'32' alignment-in-bits=3D'32' i=
d=3D'type-id-13'/>
+    <type-decl name=3D'int' size-in-bits=3D'32' id=3D'type-id-13'/>
     <array-type-def dimensions=3D'1' type-id=3D'type-id-14' size-in-bits=
=3D'256' alignment-in-bits=3D'64' id=3D'type-id-15'>
       <subrange length=3D'4' type-id=3D'type-id-4' id=3D'type-id-16'/>
     </array-type-def>
     <array-type-def dimensions=3D'1' type-id=3D'type-id-17' size-in-bits=
=3D'640' alignment-in-bits=3D'64' id=3D'type-id-18'>
       <subrange length=3D'10' type-id=3D'type-id-4' id=3D'type-id-19'/>
     </array-type-def>
-    <array-type-def dimensions=3D'1' type-id=3D'type-id-13' size-in-bits=
=3D'160' alignment-in-bits=3D'32' id=3D'type-id-20'>
+    <array-type-def dimensions=3D'1' type-id=3D'type-id-13' size-in-bits=
=3D'160' id=3D'type-id-20'>
       <subrange length=3D'5' type-id=3D'type-id-4' id=3D'type-id-10'/>
     </array-type-def>
-    <class-decl name=3D'S' size-in-bits=3D'2304' alignment-in-bits=3D'32' =
is-struct=3D'yes' visibility=3D'default' id=3D'type-id-21'>
+    <class-decl name=3D'S' size-in-bits=3D'2304' is-struct=3D'yes' visibil=
ity=3D'default' id=3D'type-id-21'>
       <data-member access=3D'public' layout-offset-in-bits=3D'0'>
         <var-decl name=3D'a' type-id=3D'type-id-20' visibility=3D'default'=
/>
       </data-member>
@@ -44,12 +44,12 @@
         <var-decl name=3D'e' type-id=3D'type-id-6' visibility=3D'default'/>
       </data-member>
     </class-decl>
-    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' alignment-in=
-bits=3D'64' id=3D'type-id-4'/>
+    <type-decl name=3D'unsigned long int' size-in-bits=3D'64' id=3D'type-i=
d-4'/>
     <pointer-type-def type-id=3D'type-id-21' size-in-bits=3D'64' alignment=
-in-bits=3D'64' id=3D'type-id-22'/>
     <pointer-type-def type-id=3D'type-id-1' size-in-bits=3D'64' alignment-=
in-bits=3D'64' id=3D'type-id-2'/>
     <pointer-type-def type-id=3D'type-id-13' size-in-bits=3D'64' alignment=
-in-bits=3D'64' id=3D'type-id-14'/>
     <pointer-type-def type-id=3D'type-id-15' size-in-bits=3D'64' alignment=
-in-bits=3D'64' id=3D'type-id-17'/>
-    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' alignment-in-bits=3D'8' elf-symbol-id=3D'foo'>
+    <function-decl name=3D'foo' visibility=3D'default' binding=3D'global' =
size-in-bits=3D'64' elf-symbol-id=3D'foo'>
       <parameter type-id=3D'type-id-22'/>
       <return type-id=3D'type-id-13'/>
     </function-decl>
--=20
2.38.1



--=20
		Dodji