test-read-ctf: Update test output files after typedef canonicalization

	* tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi:
	Adjust.
	* 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-linux-module.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/test5.o.abi: Likewise.
	* tests/data/test-read-ctf/test7.o.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

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 b9c2d33381b4f690bf8e5abd2668ca095183bcd8..91ddf1814c354519644faeed86851d2563a766bf 100644 (file)
--- 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
@@ -26,10 +26,10 @@
         <var-decl name='a' type-id='84d5ac12' visibility='default'/>
       </data-member>
     </class-decl>
+    <typedef-decl name='a_array' type-id='e022be37' id='1c12b755'/>
     <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'/>
-    <typedef-decl name='a_array' type-id='e022be37' id='1c12b755'/>
   </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 859ba2a658bac10dabf4746e6d3f52ea35ceb0fe..85e780a9cb048b8caef43a2b09ac26489f941df2 100644 (file)
--- 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
@@ -5,10 +5,10 @@
   </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='95e97e5e'/>
+    <typedef-decl name='a_t' type-id='95e97e5e' id='40acc204'/>
+    <typedef-decl name='b_t' type-id='95e97e5e' id='b3d2db81'/>
     <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='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 c4870434d971750317960d648148f1f8ced02332..400606dd369465e9ccaba4ecf16fd6a2b70dab90 100644 (file)
--- 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
@@ -5,9 +5,9 @@
   </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='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='95e97e5e' id='40acc204'/>
     <typedef-decl name='b_t' type-id='95e97e5e' id='b3d2db81'/>
+    <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'/>
   </abi-instr>
 </abi-corpus>

diff --git a/tests/data/test-read-ctf/test-linux-module.abi b/tests/data/test-read-ctf/test-linux-module.abi
index d6bff4e1d770f589215f5cd450b888cad175b950..e8081f1618fa14f181ca622b69023fb19efc7468 100644 (file)
--- a/tests/data/test-read-ctf/test-linux-module.abi
+++ b/tests/data/test-read-ctf/test-linux-module.abi
@@ -31,6 +31,12 @@
         <var-decl name='' type-id='type-id-9' visibility='default'/>
       </data-member>
     </class-decl>
+    <typedef-decl name='__u16' type-id='type-id-10' id='type-id-11'/>
+    <typedef-decl name='__u32' type-id='type-id-12' id='type-id-13'/>
+    <typedef-decl name='arch_spinlock_t' type-id='type-id-5' id='type-id-4'/>
+    <typedef-decl name='spinlock_t' type-id='type-id-8' id='type-id-14'/>
+    <typedef-decl name='u16' type-id='type-id-11' id='type-id-3'/>
+    <typedef-decl name='u32' type-id='type-id-13' id='type-id-15'/>
     <union-decl name='' size-in-bits='32' is-anonymous='yes' visibility='default' id='type-id-9'>
       <data-member access='public'>
         <var-decl name='rlock' type-id='type-id-7' visibility='default'/>
@@ -38,28 +44,22 @@
     </union-decl>
     <union-decl name='' size-in-bits='32' is-anonymous='yes' visibility='default' id='type-id-6'>
       <data-member access='public'>
-        <var-decl name='slock' type-id='type-id-10' visibility='default'/>
+        <var-decl name='slock' type-id='type-id-15' visibility='default'/>
       </data-member>
       <data-member access='public'>
         <var-decl name='tickets' type-id='type-id-2' visibility='default'/>
       </data-member>
     </union-decl>
-    <type-decl name='unsigned int' size-in-bits='32' alignment-in-bits='32' id='type-id-11'/>
-    <type-decl name='unsigned short int' size-in-bits='16' alignment-in-bits='16' id='type-id-12'/>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' alignment-in-bits='64' id='type-id-14'/>
+    <type-decl name='unsigned int' size-in-bits='32' alignment-in-bits='32' id='type-id-12'/>
+    <type-decl name='unsigned short int' size-in-bits='16' alignment-in-bits='16' id='type-id-10'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' alignment-in-bits='64' id='type-id-16'/>
     <function-decl name='testexport' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='testexport'>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='testexport2' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='testexport2'>
-      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-16'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <var-decl name='global_sym' type-id='type-id-1' mangled-name='global_sym' visibility='default' elf-symbol-id='global_sym'/>
-    <typedef-decl name='__u16' type-id='type-id-12' id='type-id-15'/>
-    <typedef-decl name='__u32' type-id='type-id-11' id='type-id-16'/>
-    <typedef-decl name='arch_spinlock_t' type-id='type-id-5' id='type-id-4'/>
-    <typedef-decl name='spinlock_t' type-id='type-id-8' id='type-id-13'/>
-    <typedef-decl name='u16' type-id='type-id-15' id='type-id-3'/>
-    <typedef-decl name='u32' type-id='type-id-16' id='type-id-10'/>
   </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 cbf377e267d415d0c0742e743dd0d49cfe9f6ef1..40a434baacbe90dfcade73c8923d0ba3209c8c64 100644 (file)
--- a/tests/data/test-read-ctf/test1.so.abi
+++ b/tests/data/test-read-ctf/test1.so.abi
@@ -14,15 +14,15 @@
         <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'/>
+    <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-5'/>
+    <pointer-type-def type-id='type-id-4' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
+    <pointer-type-def type-id='type-id-5' 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'/>
+      <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <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 a194dac07cf3e70998799714cef3131a24669ddd..cbdd0dc9d83d2ed06bdd0c73971ac11a4e461749 100644 (file)
--- a/tests/data/test-read-ctf/test1.so.hash.abi
+++ b/tests/data/test-read-ctf/test1.so.hash.abi
@@ -14,6 +14,8 @@
         <var-decl name='m0' type-id='99fcd3a5' visibility='default'/>
       </data-member>
     </class-decl>
+    <typedef-decl name='opaque_enum' type-id='55763a91' id='99fcd3a5'/>
+    <typedef-decl name='opaque_struct' type-id='6cde5052' id='dae69ca1'/>
     <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'>
@@ -21,8 +23,6 @@
       <parameter type-id='0e0526e0'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <typedef-decl name='opaque_enum' type-id='55763a91' id='99fcd3a5'/>
-    <typedef-decl name='opaque_struct' type-id='6cde5052' id='dae69ca1'/>
     <type-decl name='void' id='48b5725f'/>
   </abi-instr>
 </abi-corpus>

diff --git a/tests/data/test-read-ctf/test2.so.abi b/tests/data/test-read-ctf/test2.so.abi
index b3d7d50a805ff21919148699ec124fdafdb9b1fb..67f802f97ce62875b90edb16c7510a1b6d5f41e7 100644 (file)
--- a/tests/data/test-read-ctf/test2.so.abi
+++ b/tests/data/test-read-ctf/test2.so.abi
@@ -14,20 +14,20 @@
         <var-decl name='m0' type-id='type-id-4' visibility='default'/>
       </data-member>
     </class-decl>
-    <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-6'/>
-    <qualified-type-def type-id='type-id-7' const='yes' id='type-id-8'/>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' alignment-in-bits='64' id='type-id-9'/>
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
+    <typedef-decl name='POINTER' type-id='type-id-5' id='type-id-4'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
+    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-9'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' alignment-in-bits='64' id='type-id-5'/>
+    <pointer-type-def type-id='type-id-8' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
     <function-decl name='bar' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='bar'>
-      <parameter type-id='type-id-6'/>
-      <return type-id='type-id-7'/>
+      <parameter type-id='type-id-7'/>
+      <return type-id='type-id-8'/>
     </function-decl>
     <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-5'/>
-      <return type-id='type-id-7'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-8'/>
     </function-decl>
-    <typedef-decl name='POINTER' type-id='type-id-9' id='type-id-4'/>
-    <type-decl name='void' id='type-id-7'/>
+    <type-decl name='void' id='type-id-8'/>
   </abi-instr>
 </abi-corpus>

diff --git a/tests/data/test-read-ctf/test2.so.hash.abi b/tests/data/test-read-ctf/test2.so.hash.abi
index f9c9067ba012646798ff323e345079e660065836..6bbf347e26d1ceeaf3c15666ebc0350d75c4af0d 100644 (file)
--- a/tests/data/test-read-ctf/test2.so.hash.abi
+++ b/tests/data/test-read-ctf/test2.so.hash.abi
@@ -14,6 +14,7 @@
         <var-decl name='m0' type-id='8a34a235' visibility='default'/>
       </data-member>
     </class-decl>
+    <typedef-decl name='POINTER' type-id='6e97a70c' id='8a34a235'/>
     <pointer-type-def type-id='109cd6fe' size-in-bits='64' alignment-in-bits='64' id='842ea234'/>
     <pointer-type-def type-id='119cd891' size-in-bits='64' alignment-in-bits='64' id='5e30a4f9'/>
     <qualified-type-def type-id='48b5725f' const='yes' id='8581546e'/>
@@ -27,7 +28,6 @@
       <parameter type-id='842ea234'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <typedef-decl name='POINTER' type-id='6e97a70c' id='8a34a235'/>
     <type-decl name='void' id='48b5725f'/>
   </abi-instr>
 </abi-corpus>

diff --git a/tests/data/test-read-ctf/test5.o.abi b/tests/data/test-read-ctf/test5.o.abi
index ee2c3fb34437c2b886d228be4fcb6a95437d0689..84eb34d798f71f7830feb02a45eb05dce4e4995d 100644 (file)
--- a/tests/data/test-read-ctf/test5.o.abi
+++ b/tests/data/test-read-ctf/test5.o.abi
@@ -17,21 +17,22 @@
     <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-5'/>
     <type-decl name='long long int' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
-    <qualified-type-def type-id='type-id-4' const='yes' id='type-id-8'/>
-    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-9'/>
-    <qualified-type-def type-id='type-id-9' volatile='yes' id='type-id-10'/>
+    <typedef-decl name='long_long' type-id='type-id-6' id='type-id-7'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-8'/>
+    <qualified-type-def type-id='type-id-4' const='yes' id='type-id-9'/>
+    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-10'/>
+    <qualified-type-def type-id='type-id-10' volatile='yes' id='type-id-11'/>
     <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-7'/>
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-11'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='baz2' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='baz2'>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='bar' visibility='default' binding='global' size-in-bits='64' alignment-in-bits='8' elf-symbol-id='bar'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-9'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-12'/>
     </function-decl>
@@ -43,7 +44,6 @@
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <typedef-decl name='long_long' type-id='type-id-6' id='type-id-11'/>
     <type-decl name='variadic parameter type' id='type-id-13'/>
     <type-decl name='void' id='type-id-12'/>
   </abi-instr>

diff --git a/tests/data/test-read-ctf/test7.o.abi b/tests/data/test-read-ctf/test7.o.abi
index 5c802f304ebf50d3f315d622c76088979b81e5d2..85468e110148e9a06b9249e07c6e791657e8f7e8 100644 (file)
--- a/tests/data/test-read-ctf/test7.o.abi
+++ b/tests/data/test-read-ctf/test7.o.abi
@@ -15,19 +15,19 @@
         <var-decl name='ctor' type-id='type-id-5' visibility='default'/>
       </data-member>
     </class-decl>
+    <typedef-decl name='character' type-id='type-id-6' id='type-id-4'/>
+    <typedef-decl name='constructor' type-id='type-id-7' id='type-id-5'/>
+    <typedef-decl name='integer' type-id='type-id-1' id='type-id-3'/>
     <type-decl name='unsigned char' size-in-bits='8' alignment-in-bits='8' id='type-id-6'/>
-    <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'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-8'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' alignment-in-bits='64' id='type-id-7'/>
     <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'/>
+      <parameter type-id='type-id-8'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <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'>
+    <function-type size-in-bits='64' alignment-in-bits='8' id='type-id-9'>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-10'/>
     </function-type>