Use cache type hash values only after type canonicalization is done

Look at this code:

    struct list;

    struct payload
    {
     int value;
     list* parent_list; //<-- the hash value of struct list when looking
                        //    through this pointer is the non-zero
                        //    value as computed on the struct list
                        //    type below.

    };

    struct list
    {
     payload* p; // <-- While walking the struct list type, the hash
                 // value of the 'struct list' sub-tree node when
		 // looking through this pointer is zero, because we
		 // are still computing the hash value of struct list.
		 // we do it this way to break the otherwise infinite
                 // recursion that might occur here.

     list* next; // <-- likewise here.
     list* prev; // <-- likewise here.
    }; // <-- when we reach this point the hash value of struct list
       // is computed and is different from zero.

Basically, when a type refers to itself in one of its sub-type (like
struct list here, where list::p refers to struct list, because its
type contains a pointer to struct list), then we need to devise a way
to break the infinite recursion we might fall into when computing its
hash value.

So, when computing the hash value of struct list, when we look at the
type of list::prev, which is "list*", we say that the hash value of the type
pointed to by the type of list::next (which is struct list itself) is
zero.  This allows us to break the possibly infinite recursion here.

But then, this means that the hash value of "struct list" depends on
*when* we request that hash value.  If we are computing the hash value
of struct list itself, then the temporary value of "struct list" is
zero.  But then once we are done computing the hash value of "struct
list", that value becomes non-zero.

Hence, the hash value of a type depends on when that value is
computed.

But then if we want to cache that hash value and re-use it later,
which value should we cache?  Definitely not the zero value!

So in other words, we can use (and thus cache) the hash value of a
given type T only after the hash values of all types which use T have
been computed.

To satisfy that condition, we decide to use the (cached) hash value of
each type only after we've computed all the hash values of all types
of the system.

So, during type canonicalization, when a type T is canonicalized, this
patch stores the hash value of T.  But then it's only when all types
are canonicalized that the hashing code is allowed to re-use the
cached value of types.

This fixes the issues of spurious type differences introduced when the
same type was read either from DWARF or from abixml.  Those
differences where introduced by differences in the order of hashing
types which sub-types refer to themselves. The patch also updates
regression tests accordingly.

	* src/abg-dwarf-reader.cc (read_debug_info_into_corpus): Before we
	read debug info and build the IR, set a flag in the environment
	saying that type canonicalization isn't finished yet.  But then,
	after type canonicalization is done, flip that flag to say that
	type canonicalization is done.
	* src/abg-reader.cc (read_corpus_from_input): Likewise.
	* src/abg-ir.cc (type_base::get_canonical_type_for): Once a type
	has been canonicalized, cache its hash value.
	* src/abg-hash.cc (type_base::dynamic_hash::operator()): If type
	canonicalization has been done and if the type has a cached value,
	use that one.
	* tests/data/test-read-dwarf/test2.so.abi: Adjust.
	* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise.
	* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Likewise.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise.

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

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 7aa2eeb98a2cf33e54f18adacb450837725f3ae9..b09aede889158c27f0847737130142b0cb7c88d3 100644 (file)
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -7470,6 +7470,8 @@ read_debug_info_into_corpus(read_context& ctxt)
   // useful for get_die_parent() to work.
   build_die_parent_maps(ctxt);
 
+  ctxt.env()->canonicalization_is_done(false);
+
   // And now walk all the DIEs again to build the libabigail IR.
   Dwarf_Half dwarf_version = 0;
   for (Dwarf_Off offset = 0, next_offset = 0;
@@ -7511,6 +7513,8 @@ read_debug_info_into_corpus(read_context& ctxt)
 
   ctxt.perform_late_type_canonicalizing();
 
+  ctxt.env()->canonicalization_is_done(true);
+
   ctxt.current_corpus()->sort_functions();
   ctxt.current_corpus()->sort_variables();
 

diff --git a/src/abg-hash.cc b/src/abg-hash.cc
index d20afead7c0bcc62e2a2182acb73387176f1f966..5214ec11b00389377caea730dd7cfa68a205ad8f 100644 (file)
--- a/src/abg-hash.cc
+++ b/src/abg-hash.cc
@@ -908,6 +908,15 @@ type_base::dynamic_hash::operator()(const type_base* t) const
 {
   if (t == 0)
     return 0;
+
+  if (t->get_environment()
+      && t->get_environment()->canonicalization_is_done()
+      && t->get_cached_hash_value())
+    // Type canonicalization has been done, so we can use cached hash
+    // values.  And it appears that a has value was cached here, so
+    // let's re-use it to save precious CPU time.
+    return t->get_cached_hash_value();
+
   if (const class_decl::member_function_template* d =
       dynamic_cast<const class_decl::member_function_template*>(t))
     return class_decl::member_function_template::hash()(*d);

diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index b7485d6b9eabbcf51c150e7f6d48b2ee3dfbe3a7..e0f6df5c33f5400774105670586215f319818ea9 100644 (file)
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -5700,6 +5700,15 @@ type_base::get_canonical_type_for(type_base_sptr t)
 
   assert(result);
 
+  // Cache the hashed value that took so much CPU time to compute.
+  // That way, next time when the entire canonicalization process is
+  // done, one can re-use the cached value.
+  if (!t->get_cached_hash_value())
+    {
+      t->set_cached_hash_value(h);
+      t->set_cached_hash_value(h);
+    }
+
   return result;
 }
 

diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index f874e583979dccd4b832c74eb4e976ddd28148f4..496095e6825fef3c58ce297c37079a2d3da2dad4 100644 (file)
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -1501,6 +1501,8 @@ read_corpus_from_input(read_context& ctxt)
        }
     }
 
+  ctxt.get_environment()->canonicalization_is_done(false);
+
   // Read the translation units.
   do
     {
@@ -1512,6 +1514,9 @@ read_corpus_from_input(read_context& ctxt)
   while (is_ok);
 
   ctxt.perform_late_type_canonicalizing();
+
+  ctxt.get_environment()->canonicalization_is_done(true);
+
   corp.set_origin(corpus::NATIVE_XML_ORIGIN);
 
   return ctxt.get_corpus();;

diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
index 039a2dff608d7f3aeb95bea0525055ba9ec8ee5a..4bdaa518a53b6d945ecdb64486ae6e8bf5a137c4 100644 (file)
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -10145,7 +10145,6 @@
     </namespace-decl>
     <type-decl name='int' size-in-bits='32' id='type-id-36'/>
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-321'/>
-    <type-decl name='void' id='type-id-7'/>
     <type-decl name='char' size-in-bits='8' id='type-id-35'/>
     <qualified-type-def type-id='type-id-35' const='yes' id='type-id-27'/>
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-34'/>
@@ -16465,7 +16464,6 @@
     <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-4'/>
     <reference-type-def kind='lvalue' type-id='type-id-35' size-in-bits='64' id='type-id-43'/>
     <reference-type-def kind='lvalue' type-id='type-id-27' size-in-bits='64' id='type-id-44'/>
-    <type-decl name='void' id='type-id-7'/>
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-90'/>
     <qualified-type-def type-id='type-id-41' const='yes' id='type-id-141'/>
     <reference-type-def kind='lvalue' type-id='type-id-141' size-in-bits='64' id='type-id-91'/>
@@ -21919,7 +21917,6 @@
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-52'/>
     </function-decl>
-    <type-decl name='void' id='type-id-7'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-71'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-46'/>
     <typedef-decl name='size_t' type-id='type-id-46' filepath='/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h' line='212' column='1' id='type-id-72'/>
@@ -26378,7 +26375,6 @@
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-34'/>
     <reference-type-def kind='lvalue' type-id='type-id-35' size-in-bits='64' id='type-id-43'/>
     <reference-type-def kind='lvalue' type-id='type-id-27' size-in-bits='64' id='type-id-44'/>
-    <type-decl name='void' id='type-id-7'/>
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-90'/>
     <qualified-type-def type-id='type-id-41' const='yes' id='type-id-141'/>
     <reference-type-def kind='lvalue' type-id='type-id-141' size-in-bits='64' id='type-id-91'/>
@@ -31304,7 +31300,6 @@
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-52'/>
     </function-decl>
-    <type-decl name='void' id='type-id-7'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-71'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-46'/>
     <typedef-decl name='size_t' type-id='type-id-46' filepath='/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h' line='212' column='1' id='type-id-72'/>
@@ -34499,7 +34494,6 @@
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-52'/>
     </function-decl>
-    <type-decl name='void' id='type-id-7'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-71'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-46'/>
     <typedef-decl name='size_t' type-id='type-id-46' filepath='/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h' line='212' column='1' id='type-id-72'/>
@@ -35699,7 +35693,6 @@
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-52'/>
     </function-decl>
-    <type-decl name='void' id='type-id-7'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-71'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-46'/>
     <typedef-decl name='size_t' type-id='type-id-46' filepath='/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h' line='212' column='1' id='type-id-72'/>

diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 50ff0ee8f2569a42f509e8311e4a828bee535329..a1ecf7790e303eb57642be2a2ffb76d018875b98 100644 (file)
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -40601,7 +40601,6 @@
         <var-decl name='reg_save_area' type-id='type-id-283' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-11'/>
     <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-283'/>
     <typedef-decl name='__va_list_tag' type-id='type-id-3256' id='type-id-3257'/>
     <pointer-type-def type-id='type-id-3257' size-in-bits='64' id='type-id-3258'/>
@@ -49199,7 +49198,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-11'/>
     <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-1323'/>
     <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-1324'/>
     <namespace-decl name='mongo'>

diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index 962d66e79dfc2d1ffb3f44acb89318f55435a929..d8899fcb04cc4b6d63837212bfb96c45928dd93a 100644 (file)
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -508,7 +508,6 @@
       <parameter type-id='type-id-46' name='str' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='2476' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-25'/>
     <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-47'/>
     <function-decl name='_dbus_auth_get_buffer' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='2520' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -615,7 +614,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-bus.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusConnection' size-in-bits='2112' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-52'/>
     <typedef-decl name='DBusConnection' type-id='type-id-52' filepath='../dbus/dbus-connection.h' line='51' column='1' id='type-id-53'/>
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-54'/>
@@ -894,7 +892,6 @@
     </class-decl>
     <typedef-decl name='DBusList' type-id='type-id-10' filepath='../dbus/dbus-sysdeps.h' line='74' column='1' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-6'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <class-decl name='DBusMessage' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='100' column='1' id='type-id-81'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -1564,7 +1561,6 @@
     <var-decl name='_dbus_current_generation' type-id='type-id-8' visibility='default' filepath='../dbus/dbus-internals.h' line='299' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-credentials.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusCredentials' size-in-bits='384' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-credentials.c' line='48' column='1' id='type-id-40'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-credentials.c' line='49' column='1'/>
@@ -1767,7 +1763,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <qualified-type-def type-id='type-id-17' const='yes' id='type-id-131'/>
@@ -1927,7 +1922,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='../dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
@@ -2020,7 +2014,6 @@
       <parameter type-id='type-id-21' name='flag' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-header.c' line='1480' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <type-decl name='void' id='type-id-13'/>
     <function-decl name='_dbus_header_byteswap' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-header.c' line='1496' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-138' name='header' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-header.c' line='1496' column='1'/>
       <parameter type-id='type-id-8' name='new_order' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-header.c' line='1497' column='1'/>
@@ -2208,7 +2201,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-marshal-byteswap.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusString' size-in-bits='192' is-struct='yes' visibility='default' filepath='../dbus/dbus-string.h' line='43' column='1' id='type-id-7'>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='dummy2' type-id='type-id-8' visibility='default' filepath='../dbus/dbus-string.h' line='49' column='1'/>
@@ -2246,7 +2238,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-marshal-recursive.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
@@ -2703,7 +2694,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-message.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusMessage' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='100' column='1' id='type-id-81'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-59' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='101' column='1'/>
@@ -3549,7 +3539,6 @@
     <var-decl name='_dbus_current_generation' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-internals.h' line='299' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-misc.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <type-decl name='int' size-in-bits='32' id='type-id-8'/>
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-24'/>
     <function-decl name='dbus_get_version' mangled-name='dbus_get_version' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_get_version'>
@@ -3636,7 +3625,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='../dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
@@ -3845,7 +3833,6 @@
     <typedef-decl name='DBusAtomic' type-id='type-id-72' filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-59'/>
     <typedef-decl name='DBusObjectSubtree' type-id='type-id-192' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-object-tree.c' line='46' column='1' id='type-id-194'/>
     <pointer-type-def type-id='type-id-194' size-in-bits='64' id='type-id-191'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-193'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-9'/>
@@ -4020,7 +4007,6 @@
         <var-decl name='data' type-id='type-id-11' visibility='default' filepath='../dbus/dbus-dataslot.h' line='38' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusDataSlot' type-id='type-id-90' filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-91'/>
     <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-89'/>
@@ -4209,7 +4195,6 @@
     </class-decl>
     <type-decl name='int' size-in-bits='32' id='type-id-8'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-83'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='dbus_uint32_t' type-id='type-id-9' filepath='../dbus/dbus-arch-deps.h' line='43' column='1' id='type-id-21'/>
@@ -4266,7 +4251,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-server.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-198'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -4540,7 +4524,6 @@
     <var-decl name='_dbus_return_if_fail_warning_format' type-id='type-id-3' visibility='default' filepath='../dbus/dbus-internals.h' line='154' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-server-debug-pipe.c' language='LANG_C89'/>  <abi-instr version='1.0' address-size='64' path='dbus-server-socket.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-198'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-59' visibility='default' filepath='../dbus/dbus-server-protected.h' line='58' column='1'/>
@@ -4777,7 +4760,6 @@
         <var-decl name='padding1' type-id='type-id-11' visibility='default' filepath='../dbus/dbus-errors.h' line='59' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='../dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
@@ -4897,7 +4879,6 @@
         <var-decl name='data' type-id='type-id-11' visibility='default' filepath='../dbus/dbus-dataslot.h' line='38' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusDataSlot' type-id='type-id-90' filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-91'/>
     <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-89'/>
@@ -4965,7 +4946,6 @@
     <var-decl name='_dbus_no_memory_message' type-id='type-id-3' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-internals.h' line='264' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-sha.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusSHAContext' size-in-bits='736' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sha.h' line='38' column='1' id='type-id-208'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='digest' type-id='type-id-209' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sha.h' line='39' column='1'/>
@@ -5037,7 +5017,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-signature.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h' line='45' column='1' id='type-id-213'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dummy1' type-id='type-id-11' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h' line='46' column='1'/>
@@ -5184,7 +5163,6 @@
         <var-decl name='padding1' type-id='type-id-11' visibility='default' filepath='../dbus/dbus-errors.h' line='59' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='../dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
@@ -5240,7 +5218,6 @@
       </data-member>
     </class-decl>
     <type-decl name='int' size-in-bits='32' id='type-id-8'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='DBusTimeout' type-id='type-id-109' filepath='../dbus/dbus-connection.h' line='45' column='1' id='type-id-110'/>
@@ -5344,7 +5321,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-threads.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusRMutex' size-in-bits='320' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-75'/>
     <typedef-decl name='DBusRMutex' type-id='type-id-75' filepath='../dbus/dbus-threads-internal.h' line='39' column='1' id='type-id-76'/>
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-60'/>
@@ -5554,7 +5530,6 @@
     <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-64'/>
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-19'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='DBusTransport' type-id='type-id-95' filepath='../dbus/dbus-transport.h' line='33' column='1' id='type-id-96'/>
@@ -5906,7 +5881,6 @@
     <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-64'/>
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-19'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='DBusTransport' type-id='type-id-231' filepath='../dbus/dbus-transport.h' line='33' column='1' id='type-id-232'/>
@@ -6026,7 +6000,6 @@
       </data-member>
     </class-decl>
     <type-decl name='int' size-in-bits='32' id='type-id-8'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusWatch' type-id='type-id-106' filepath='../dbus/dbus-connection.h' line='43' column='1' id='type-id-107'/>
     <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
@@ -6225,7 +6198,6 @@
       <parameter type-id='type-id-219' name='lock' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-dataslot.c' line='47' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusDataSlotList' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-dataslot.h' line='70' column='1' id='type-id-88'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='slots' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-dataslot.h' line='71' column='1'/>
@@ -6333,7 +6305,6 @@
     </class-decl>
     <typedef-decl name='DBusHashEntry' type-id='type-id-248' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-hash.c' line='135' column='1' id='type-id-250'/>
     <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-249'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-244'/>
     <array-type-def dimensions='1' type-id='type-id-249' size-in-bits='256' id='type-id-245'>
@@ -6574,7 +6545,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='../dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
@@ -6751,7 +6721,6 @@
     <var-decl name='stderr' type-id='type-id-182' visibility='default' filepath='/usr/include/stdio.h' line='167' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-list.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusList' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-list.h' line='35' column='1' id='type-id-10'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='prev' type-id='type-id-6' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-list.h' line='36' column='1'/>
@@ -6913,7 +6882,6 @@
       <parameter type-id='type-id-8' name='typecode' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-basic.c' line='1219' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <type-decl name='void' id='type-id-13'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-153'/>
     <qualified-type-def type-id='type-id-153' const='yes' id='type-id-154'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
@@ -7046,7 +7014,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-memory.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <function-decl name='dbus_free' mangled-name='dbus_free' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='701' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_free'>
       <parameter type-id='type-id-11' name='memory' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='701' column='1'/>
@@ -7144,7 +7111,6 @@
     </array-type-def>
     <typedef-decl name='DBusMemPool' type-id='type-id-252' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-mempool.h' line='33' column='1' id='type-id-253'/>
     <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-247'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <function-decl name='_dbus_mem_pool_dealloc' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-mempool.c' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-247' name='pool' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-mempool.c' line='347' column='1'/>
@@ -7174,7 +7140,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-pipe.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusPipe' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pipe.h' line='41' column='1' id='type-id-270'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fd' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pipe.h' line='42' column='1'/>
@@ -7209,7 +7174,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-string.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusString' size-in-bits='192' is-struct='yes' visibility='default' filepath='../dbus/dbus-string.h' line='43' column='1' id='type-id-7'>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='dummy2' type-id='type-id-8' visibility='default' filepath='../dbus/dbus-string.h' line='49' column='1'/>
@@ -7854,7 +7818,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
@@ -8041,7 +8004,6 @@
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-9'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='DBusError' type-id='type-id-16' filepath='../dbus/dbus-errors.h' line='43' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
@@ -8201,7 +8163,6 @@
         <var-decl name='msg_flags' type-id='type-id-8' visibility='default' filepath='/usr/include/bits/socket.h' line='261' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='__socklen_t' type-id='type-id-9' filepath='/usr/include/bits/types.h' line='192' column='1' id='type-id-291'/>
     <typedef-decl name='socklen_t' type-id='type-id-291' filepath='/usr/include/unistd.h' line='275' column='1' id='type-id-289'/>
@@ -8815,7 +8776,6 @@
     <var-decl name='stderr' type-id='type-id-182' visibility='default' filepath='/usr/include/stdio.h' line='167' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-sysdeps-pthread.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <function-decl name='_dbus_threads_unlock_platform_specific' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps-pthread.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-13'/>
     </function-decl>
@@ -8977,7 +8937,6 @@
     <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-64'/>
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-19'/>
-    <type-decl name='void' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-11'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='DBusTransport' type-id='type-id-231' filepath='../dbus/dbus-transport.h' line='33' column='1' id='type-id-232'/>
@@ -9156,7 +9115,6 @@
     <var-decl name='stdout' type-id='type-id-182' visibility='default' filepath='/usr/include/stdio.h' line='166' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-userdb.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-13'/>
     <class-decl name='DBusUserDatabase' size-in-bits='320' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-userdb.h' line='44' column='1' id='type-id-308'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-userdb.h' line='45' column='1'/>
@@ -9400,7 +9358,6 @@
     <function-decl name='_dbus_get_is_errno_nonzero' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='729' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-22'/>
     </function-decl>
-    <type-decl name='void' id='type-id-13'/>
     <function-decl name='_dbus_set_errno_to_zero' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='715' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-13'/>
     </function-decl>

diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 3b2e4973d3b024a616e947b1cf07dad2ab75d0e4..c9105065ab0f044aadd3326bf3c344aa2ab592bd 100644 (file)
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -345,7 +345,6 @@
       <parameter type-id='type-id-35' name='objw' filepath='libutil/project.c' line='314' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-37'/>
     <function-decl name='gluPickMatrix' mangled-name='gluPickMatrix' filepath='libutil/project.c' line='348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPickMatrix'>
       <parameter type-id='type-id-30' name='x' filepath='libutil/project.c' line='348' column='1'/>
@@ -383,7 +382,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libutil/quad.c' language='LANG_C99'>
-    <type-decl name='void' id='type-id-12'/>
     <class-decl name='GLUquadric' size-in-bits='192' is-struct='yes' visibility='default' filepath='libutil/quad.c' line='45' column='1' id='type-id-38'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='normals' type-id='type-id-10' visibility='default' filepath='libutil/quad.c' line='46' column='1'/>
@@ -721,7 +719,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-27' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-22'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -745,7 +742,6 @@
         <var-decl name='prev' type-id='type-id-44' visibility='default' filepath='libtess/dict-list.h' line='91' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <typedef-decl name='DictListKey' type-id='type-id-13' filepath='libtess/dict-list.h' line='60' column='1' id='type-id-43'/>
     <typedef-decl name='DictListNode' type-id='type-id-42' filepath='libtess/dict-list.h' line='62' column='1' id='type-id-45'/>
@@ -869,7 +865,6 @@
     </class-decl>
     <typedef-decl name='GLUface' type-id='type-id-58' filepath='libtess/mesh.h' line='43' column='1' id='type-id-59'/>
     <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-55'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
     <typedef-decl name='GLboolean' type-id='type-id-1' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-39'/>
@@ -935,7 +930,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/mesh.c' language='LANG_C99'>
-    <type-decl name='void' id='type-id-12'/>
     <class-decl name='GLUmesh' size-in-bits='2048' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='163' column='1' id='type-id-62'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='vHead' type-id='type-id-53' visibility='default' filepath='libtess/mesh.h' line='164' column='1'/>
@@ -1090,7 +1084,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/normal.c' language='LANG_C99'>
-    <type-decl name='void' id='type-id-12'/>
     <class-decl name='GLUtesselator' size-in-bits='29376' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='59' column='1' id='type-id-65'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='state' type-id='type-id-66' visibility='default' filepath='libtess/tess.h' line='63' column='1'/>
@@ -1412,7 +1405,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/priorityq.c' language='LANG_C99'>
-    <type-decl name='void' id='type-id-12'/>
     <class-decl name='PriorityQHeap' size-in-bits='448' is-struct='yes' visibility='default' filepath='libtess/priorityq-heap.h' line='86' column='1' id='type-id-76'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='nodes' type-id='type-id-77' visibility='default' filepath='libtess/priorityq-heap.h' line='87' column='1'/>
@@ -1543,7 +1535,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/render.c' language='LANG_C99'>
-    <type-decl name='void' id='type-id-12'/>
     <class-decl name='GLUtesselator' size-in-bits='29376' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='59' column='1' id='type-id-65'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='state' type-id='type-id-66' visibility='default' filepath='libtess/tess.h' line='63' column='1'/>
@@ -2001,7 +1992,6 @@
     </class-decl>
     <typedef-decl name='GLUvertex' type-id='type-id-106' filepath='libtess/mesh.h' line='42' column='1' id='type-id-107'/>
     <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-102'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='double' size-in-bits='64' id='type-id-29'/>
     <typedef-decl name='GLdouble' type-id='type-id-29' filepath='../../../include/GL/gl.h' line='162' column='1' id='type-id-30'/>
@@ -2219,7 +2209,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/tess.c' language='LANG_C99'>
-    <type-decl name='void' id='type-id-12'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-5'/>
     <typedef-decl name='GLenum' type-id='type-id-5' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-6'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
@@ -2759,7 +2748,6 @@
     </class-decl>
     <typedef-decl name='GLUface' type-id='type-id-58' filepath='libtess/mesh.h' line='43' column='1' id='type-id-59'/>
     <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-55'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
     <typedef-decl name='GLboolean' type-id='type-id-1' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-39'/>
@@ -2794,7 +2782,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/bezierEval.cc' language='LANG_C_plus_plus'>
-    <type-decl name='void' id='type-id-12'/>
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-118'/>
@@ -3041,7 +3028,6 @@
       <parameter type-id='type-id-122' name='b' filepath='libnurbs/interface/bezierPatch.cc' line='119' column='1'/>
       <return type-id='type-id-122'/>
     </function-decl>
-    <type-decl name='void' id='type-id-12'/>
     <function-decl name='bezierPatchDraw' filepath='libnurbs/interface/bezierPatch.cc' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-122' name='bpatch' filepath='libnurbs/interface/bezierPatch.cc' line='175' column='1'/>
       <parameter type-id='type-id-9' name='u_reso' filepath='libnurbs/interface/bezierPatch.cc' line='175' column='1'/>
@@ -3341,7 +3327,6 @@
       <parameter type-id='type-id-128' name='list' filepath='libnurbs/interface/bezierPatchMesh.cc' line='85' column='1'/>
       <return type-id='type-id-128'/>
     </function-decl>
-    <type-decl name='void' id='type-id-12'/>
     <function-decl name='bezierPatchMeshBeginStrip' filepath='libnurbs/interface/bezierPatchMesh.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-128' name='bpm' filepath='libnurbs/interface/bezierPatchMesh.cc' line='245' column='1'/>
       <parameter type-id='type-id-6' name='type' filepath='libnurbs/interface/bezierPatchMesh.cc' line='245' column='1'/>
@@ -3588,7 +3573,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-134'>
@@ -4065,7 +4049,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-139'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
@@ -4574,7 +4557,6 @@
     <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-151'/>
     <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' is-declaration-only='yes' id='type-id-136'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-154'/>
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
     <typedef-decl name='GLfloat' type-id='type-id-115' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-116'/>
@@ -4726,7 +4708,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-160'>
@@ -6022,7 +6003,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-139'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
@@ -6516,7 +6496,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-152'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
@@ -7063,7 +7042,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -7345,7 +7323,6 @@
     <var-decl name='stdout' type-id='type-id-17' visibility='default' filepath='/usr/include/stdio.h' line='166' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' language='LANG_C_plus_plus'>
-    <type-decl name='void' id='type-id-12'/>
     <type-decl name='char' size-in-bits='8' id='type-id-25'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
@@ -9050,7 +9027,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -9746,7 +9722,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -10376,7 +10351,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <class-decl name='BasicCurveEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-134'>
@@ -10499,7 +10473,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-164'>
@@ -11116,7 +11089,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -11386,7 +11358,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
   </abi-instr>
@@ -11456,7 +11427,6 @@
       </member-function>
     </class-decl>
     <type-decl name='enum-ServiceMode-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-258'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
   </abi-instr>
@@ -11486,7 +11456,6 @@
       <parameter type-id='type-id-138' name='x' filepath='libnurbs/internals/simplemath.h' line='50' column='1'/>
       <return type-id='type-id-138'/>
     </function-decl>
-    <type-decl name='void' id='type-id-12'/>
     <class-decl name='JumpBuffer' size-in-bits='1600' is-struct='yes' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='56' column='1' id='type-id-228'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='buf' type-id='type-id-229' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
@@ -13079,7 +13048,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -15047,7 +15015,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -15599,7 +15566,6 @@
     <array-type-def dimensions='1' type-id='type-id-138' size-in-bits='96' id='type-id-176'>
       <subrange length='3'/>
     </array-type-def>
-    <type-decl name='void' id='type-id-12'/>
     <class-decl name='Quilt' size-in-bits='896' visibility='default' filepath='libnurbs/internals/quilt.h' line='64' column='1' id='type-id-305'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-178'/>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -16796,7 +16762,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <reference-type-def kind='lvalue' type-id='type-id-188' size-in-bits='64' id='type-id-186'/>
@@ -18608,7 +18573,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -19586,7 +19550,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -19904,7 +19867,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-202'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <class-decl name='FlistSorter' size-in-bits='128' visibility='default' is-declaration-only='yes' id='type-id-236'>
@@ -19990,7 +19952,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-202'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <class-decl name='FlistSorter' size-in-bits='128' visibility='default' filepath='libnurbs/internals/flistsorter.h' line='42' column='1' id='type-id-236'>
@@ -20527,7 +20488,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -21054,7 +21014,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -23091,7 +23050,6 @@
     </class-decl>
     <type-decl name='long int' size-in-bits='64' id='type-id-27'/>
     <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-295'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-356'/>
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-118'/>
     <type-decl name='char' size-in-bits='8' id='type-id-25'/>
@@ -23730,7 +23688,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -25067,7 +25024,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -25288,7 +25244,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <class-decl name='Mapdesc' size-in-bits='3392' is-struct='yes' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='49' column='1' id='type-id-246'>
@@ -26080,7 +26035,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -27660,7 +27614,6 @@
     <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-367'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='Int' type-id='type-id-9' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-318'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-368'/>
     <array-type-def dimensions='1' type-id='type-id-322' size-in-bits='64' id='type-id-328'>
       <subrange length='2'/>
@@ -28888,7 +28841,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-178'>
@@ -31028,7 +30980,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -34874,7 +34825,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-207'>
@@ -38743,7 +38693,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -39618,7 +39567,6 @@
     <array-type-def dimensions='1' type-id='type-id-138' size-in-bits='64' id='type-id-161'>
       <subrange length='2'/>
     </array-type-def>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-391'/>
     <array-type-def dimensions='1' type-id='type-id-389' size-in-bits='640' id='type-id-395'>
       <subrange length='2'/>
@@ -40168,7 +40116,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-178'>
@@ -41871,7 +41818,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -42309,7 +42255,6 @@
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
     <typedef-decl name='REAL' type-id='type-id-115' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-138'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-404'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-27'/>
   </abi-instr>
@@ -42356,7 +42301,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -45263,7 +45207,6 @@
     <var-decl name='MAXSTRIPSIZE' type-id='type-id-149' mangled-name='_ZN12CoveAndTiler12MAXSTRIPSIZEE' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='53' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/sorter.cc' language='LANG_C_plus_plus'>
-    <type-decl name='void' id='type-id-12'/>
     <type-decl name='char' size-in-bits='8' id='type-id-25'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
@@ -45602,7 +45545,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -47012,7 +46954,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-178'>
@@ -50100,7 +50041,6 @@
     <var-decl name='MAXSTRIPSIZE' type-id='type-id-149' mangled-name='_ZN12CoveAndTiler12MAXSTRIPSIZEE' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='53' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' language='LANG_C_plus_plus'>
-    <type-decl name='void' id='type-id-12'/>
     <type-decl name='char' size-in-bits='8' id='type-id-25'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
@@ -51053,7 +50993,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -52325,7 +52264,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -52726,7 +52664,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-196'/>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <class-decl name='TrimVertexPool' size-in-bits='2624' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-424'>
@@ -53052,7 +52989,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -53524,7 +53460,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -53896,7 +53831,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <class-decl name='directedLine' size-in-bits='448' visibility='default' filepath='libnurbs/nurbtess/directedLine.h' line='41' column='1' id='type-id-314'>
@@ -54698,7 +54632,6 @@
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
     <typedef-decl name='Real' type-id='type-id-115' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-322'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
     <class-decl name='primStream' size-in-bits='384' visibility='default' filepath='libnurbs/nurbtess/primitiveStream.h' line='44' column='1' id='type-id-372'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -55620,7 +55553,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-317'/>
@@ -56293,7 +56225,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-317'/>
@@ -56544,7 +56475,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-366'>
@@ -57997,7 +57927,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-317'/>
@@ -58636,7 +58565,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-317'/>
@@ -58977,7 +58905,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-366'>
@@ -59847,7 +59774,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-27' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-22'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-28'/>
     <typedef-decl name='size_t' type-id='type-id-28' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
@@ -59986,7 +59912,6 @@
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
     <typedef-decl name='Real' type-id='type-id-115' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-322'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-371'/>
     <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='271' column='1' id='type-id-14'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -60107,7 +60032,6 @@
     <var-decl name='stdout' type-id='type-id-17' visibility='default' filepath='/usr/include/stdio.h' line='166' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/quicksort.cc' language='LANG_C_plus_plus'>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-114'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
@@ -60313,7 +60237,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='Int' type-id='type-id-9' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-318'/>
     <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-373'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-411'/>
     <class-decl name='gridBoundaryChain' size-in-bits='320' visibility='default' filepath='libnurbs/nurbtess/gridWrap.h' line='96' column='1' id='type-id-414'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -61050,7 +60973,6 @@
     <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-367'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='Int' type-id='type-id-9' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-318'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-368'/>
     <array-type-def dimensions='1' type-id='type-id-322' size-in-bits='64' id='type-id-328'>
       <subrange length='2'/>
@@ -61927,7 +61849,6 @@
     <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-367'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='Int' type-id='type-id-9' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-318'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-368'/>
     <array-type-def dimensions='1' type-id='type-id-322' size-in-bits='64' id='type-id-328'>
       <subrange length='2'/>
@@ -62737,7 +62658,6 @@
     <type-decl name='float' size-in-bits='32' id='type-id-115'/>
     <typedef-decl name='Real' type-id='type-id-115' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-322'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
     <class-decl name='primStream' size-in-bits='384' visibility='default' filepath='libnurbs/nurbtess/primitiveStream.h' line='44' column='1' id='type-id-372'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -63472,7 +63392,6 @@
     <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-367'/>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <typedef-decl name='Int' type-id='type-id-9' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-318'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-368'/>
     <array-type-def dimensions='1' type-id='type-id-322' size-in-bits='64' id='type-id-328'>
       <subrange length='2'/>
@@ -64248,7 +64167,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-366'>
@@ -65799,7 +65717,6 @@
     <typedef-decl name='Real2' type-id='type-id-328' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-316'/>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-327'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-319'/>
     <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/libio.h' line='271' column='1' id='type-id-14'>
@@ -65935,7 +65852,6 @@
         <var-decl name='right' type-id='type-id-443' visibility='default' filepath='libnurbs/nurbtess/searchTree.h' line='40' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-443'/>
     <typedef-decl name='treeNode' type-id='type-id-442' filepath='libnurbs/nurbtess/searchTree.h' line='41' column='1' id='type-id-444'/>

diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 4215133674dfb97c4a5eaed81fe5e4386e7b328b..b5b4c99a88263f8c1334b23860149bf376ab5e72 100644 (file)
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -3384,7 +3384,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <namespace-decl name='__tsan'>
@@ -6282,7 +6281,6 @@
         <return type-id='type-id-3'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
@@ -7033,7 +7031,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-134'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
     <namespace-decl name='__tsan'>
       <function-decl name='thread_name' filepath='../../.././libsanitizer/tsan/tsan_report.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9814,7 +9811,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
@@ -15208,7 +15204,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
@@ -18955,7 +18950,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-444'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-445'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-446'/>
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-442'/>
@@ -24394,7 +24388,6 @@
     <qualified-type-def type-id='type-id-16' const='yes' id='type-id-78'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <qualified-type-def type-id='type-id-6' const='yes' id='type-id-79'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-150'/>
     <qualified-type-def type-id='type-id-138' const='yes' id='type-id-218'/>
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-151'/>
@@ -26490,7 +26483,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
@@ -30672,7 +30664,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-64'/>
     <qualified-type-def type-id='type-id-61' volatile='yes' id='type-id-63'/>
@@ -33511,7 +33502,6 @@
         <return type-id='type-id-9'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <namespace-decl name='__sanitizer'>
       <var-decl name='SanitizerToolName' type-id='type-id-1' mangled-name='_ZN11__sanitizer17SanitizerToolNameE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='36' column='1'/>
       <typedef-decl name='u64' type-id='type-id-5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='69' column='1' id='type-id-6'/>
@@ -35215,7 +35205,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
@@ -37521,7 +37510,6 @@
       <typedef-decl name='uptr' type-id='type-id-2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='56' column='1' id='type-id-3'/>
       <typedef-decl name='u32' type-id='type-id-25' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='68' column='1' id='type-id-33'/>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
@@ -40412,7 +40400,6 @@
       <typedef-decl name='OFF64_T' type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='85' column='1' id='type-id-611'/>
       <typedef-decl name='OFF_T' type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='81' column='1' id='type-id-612'/>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
@@ -50136,7 +50123,6 @@
         <return type-id='type-id-4'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
@@ -51839,7 +51825,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <namespace-decl name='__tsan'>
@@ -55739,7 +55724,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-134'/>
@@ -57640,7 +57624,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
@@ -62776,7 +62759,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
@@ -68564,7 +68546,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
@@ -73757,7 +73738,6 @@
         </data-member>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <qualified-type-def type-id='type-id-48' volatile='yes' id='type-id-49'/>
@@ -77600,7 +77580,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
@@ -79842,7 +79821,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
@@ -80087,7 +80065,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-134'/>
     <namespace-decl name='__tsan'>
@@ -81639,7 +81616,6 @@
         <return type-id='type-id-4'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
@@ -82301,7 +82277,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-444'/>
-    <type-decl name='void' id='type-id-9'/>
     <reference-type-def kind='lvalue' type-id='type-id-2' size-in-bits='64' id='type-id-783'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-134'/>
@@ -82366,7 +82341,6 @@
     </namespace-decl>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
-    <type-decl name='void' id='type-id-9'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_coverage.cc' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
@@ -82806,7 +82780,6 @@
     </namespace-decl>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
-    <type-decl name='void' id='type-id-9'/>
     <reference-type-def kind='lvalue' type-id='type-id-2' size-in-bits='64' id='type-id-783'/>
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <qualified-type-def type-id='type-id-7' const='yes' id='type-id-8'/>
@@ -82965,7 +82938,6 @@
         <return type-id='type-id-4'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <qualified-type-def type-id='type-id-7' const='yes' id='type-id-8'/>
@@ -83166,7 +83138,6 @@
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-134'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <type-decl name='long long int' size-in-bits='64' id='type-id-553'/>
@@ -83686,7 +83657,6 @@
       </enum-decl>
       <class-decl name='InternalMmapVector&lt;__sanitizer::Suppression*&gt;' size-in-bits='192' visibility='default' is-declaration-only='yes' id='type-id-570'/>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
@@ -84604,7 +84574,6 @@
         <return type-id='type-id-3'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
@@ -85133,7 +85102,6 @@
         <return type-id='type-id-3'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-863'/>
@@ -85858,7 +85826,6 @@
     </namespace-decl>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-25'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
@@ -86204,7 +86171,6 @@
     </namespace-decl>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <qualified-type-def type-id='type-id-7' const='yes' id='type-id-8'/>
@@ -86456,7 +86422,6 @@
       </data-member>
     </class-decl>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-25'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <pointer-type-def type-id='type-id-701' size-in-bits='64' id='type-id-702'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
@@ -87018,7 +86983,6 @@
         <return type-id='type-id-888'/>
       </function-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
@@ -87479,7 +87443,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-444'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-134'/>
     <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-512'/>
@@ -87598,7 +87561,6 @@
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='16384' id='type-id-399'>
       <subrange length='256'/>
     </array-type-def>
-    <type-decl name='void' id='type-id-9'/>
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-37'/>
     <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-402'/>
     <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
@@ -88208,7 +88170,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-444'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <qualified-type-def type-id='type-id-16' const='yes' id='type-id-78'/>
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-442'/>
@@ -88645,7 +88606,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='enum-SuppressionType-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-135'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-431'/>
@@ -89479,7 +89439,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <qualified-type-def type-id='type-id-16' const='yes' id='type-id-78'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-60'/>
@@ -89944,7 +89903,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-64'/>
     <qualified-type-def type-id='type-id-61' volatile='yes' id='type-id-63'/>
@@ -90133,7 +90091,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-431'/>
@@ -90465,7 +90422,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='enum-memory_order-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-294'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-64'/>
     <qualified-type-def type-id='type-id-61' volatile='yes' id='type-id-63'/>
@@ -91026,7 +90982,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-5'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
@@ -91083,7 +91038,6 @@
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-1'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <function-decl name='dlsym' filepath='/usr/include/dlfcn.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -91212,7 +91166,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-253' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-497'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <typedef-decl name='size_t' type-id='type-id-2' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='212' column='1' id='type-id-481'/>
@@ -91253,7 +91206,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-926'/>
     <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-925'/>
@@ -91498,7 +91450,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-926'/>
     <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-925'/>
@@ -91650,7 +91601,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-442'/>
     <function-decl name='__asan_backtrace_open' mangled-name='__asan_backtrace_open' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_open'>
@@ -91800,7 +91750,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/sort.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <typedef-decl name='size_t' type-id='type-id-2' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='212' column='1' id='type-id-481'/>
@@ -91957,7 +91906,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' id='type-id-1'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-926'/>
     <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-925'/>
@@ -92289,7 +92237,6 @@
     </function-decl>
     <qualified-type-def type-id='type-id-931' const='yes' id='type-id-942'/>
     <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <function-decl name='__asan_cplus_demangle_print_callback' mangled-name='__asan_cplus_demangle_print_callback' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='4029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_print_callback'>
       <parameter type-id='type-id-16' name='options' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='4029' column='1'/>
@@ -92593,7 +92540,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='int' size-in-bits='32' id='type-id-16'/>
@@ -92665,7 +92611,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-926'/>
     <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-925'/>
@@ -92844,7 +92789,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-7'/>
     <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' id='type-id-1'/>
-    <type-decl name='void' id='type-id-9'/>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-4'/>
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-926'/>
     <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-925'/>
@@ -93012,7 +92956,6 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' language='LANG_C89'>
-    <type-decl name='void' id='type-id-9'/>
     <class-decl name='backtrace_state' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='127' column='1' id='type-id-920'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='filename' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='130' column='1'/>

diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 55069df4ec24d929d40a68f552c82cade27142a6..c53cae4ace0ee402753726b627f227fa9b809d4e 100644 (file)
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -2563,7 +2563,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -2860,7 +2859,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -3017,7 +3015,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -3823,7 +3820,6 @@
     </class-decl>
     <qualified-type-def type-id='type-id-15' const='yes' id='type-id-20'/>
     <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-21'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <qualified-type-def type-id='type-id-33' const='yes' id='type-id-35'/>
     <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-34'/>
@@ -4655,7 +4651,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -7948,7 +7943,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -8115,7 +8109,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -8909,7 +8902,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -9620,7 +9612,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -49742,7 +49733,6 @@
     <type-decl name='char' size-in-bits='8' id='type-id-15'/>
     <qualified-type-def type-id='type-id-15' const='yes' id='type-id-20'/>
     <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-21'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='uint64_t' type-id='type-id-19' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-102'/>
@@ -63476,7 +63466,6 @@
     </namespace-decl>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-620'/>
-    <type-decl name='void' id='type-id-18'/>
     <reference-type-def kind='lvalue' type-id='type-id-619' size-in-bits='64' id='type-id-621'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1850'/>
     <array-type-def dimensions='1' type-id='type-id-1850' size-in-bits='64' id='type-id-1549'>
@@ -64178,7 +64167,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -111059,7 +111047,6 @@
     <typedef-decl name='lldiv_t' type-id='type-id-281' filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-241'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-620'/>
-    <type-decl name='void' id='type-id-18'/>
     <reference-type-def kind='lvalue' type-id='type-id-619' size-in-bits='64' id='type-id-621'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1850'/>
     <array-type-def dimensions='1' type-id='type-id-1850' size-in-bits='128' id='type-id-1596'>
@@ -133971,7 +133958,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -138261,7 +138247,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>
@@ -160580,7 +160565,6 @@
       <subrange length='1'/>
     </array-type-def>
     <typedef-decl name='__off64_t' type-id='type-id-17' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-11'/>
-    <type-decl name='void' id='type-id-18'/>
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-12'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-19'/>
     <typedef-decl name='size_t' type-id='type-id-19' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-13'/>

diff --git a/tests/data/test-read-dwarf/test2.so.abi b/tests/data/test-read-dwarf/test2.so.abi
index 50e2b18e12a4963ed524a1134834c40889d1536c..20850e5180106be0924f9582872c51710c7fe53c 100644 (file)
--- a/tests/data/test-read-dwarf/test2.so.abi
+++ b/tests/data/test-read-dwarf/test2.so.abi
@@ -69,7 +69,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='void' id='type-id-5'/>
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-9'/>
     <namespace-decl name='a'>
       <function-decl name='build_second_type' mangled-name='_ZN1a17build_second_typeEv' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2-1.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN1a17build_second_typeEv'>

diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
index 3cbbd771c8d803ef7149384c2f167407483b3182..84e9aeb4ca80b69a8830b4d84e76303024173edb 100644 (file)
--- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
+++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
@@ -4977,7 +4977,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-6'/>
     <type-decl name='enum-file_type-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-158'/>
     <type-decl name='enum-perms-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-159'/>
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-155'/>
@@ -8601,7 +8600,6 @@
     <reference-type-def kind='lvalue' type-id='type-id-295' size-in-bits='64' id='type-id-298'/>
     <qualified-type-def type-id='type-id-295' const='yes' id='type-id-345'/>
     <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-299'/>
-    <type-decl name='void' id='type-id-6'/>
     <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-300'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-40'/>
     <qualified-type-def type-id='type-id-306' const='yes' id='type-id-346'/>
@@ -11176,7 +11174,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-6'/>
     <type-decl name='char' size-in-bits='8' id='type-id-24'/>
     <qualified-type-def type-id='type-id-24' const='yes' id='type-id-25'/>
     <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-13'/>
@@ -12836,7 +12833,6 @@
     </namespace-decl>
     <qualified-type-def type-id='type-id-8' const='yes' id='type-id-145'/>
     <reference-type-def kind='lvalue' type-id='type-id-145' size-in-bits='64' id='type-id-141'/>
-    <type-decl name='void' id='type-id-6'/>
     <function-decl name='abort' filepath='/usr/include/stdlib.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -15833,7 +15829,6 @@
       </class-decl>
     </namespace-decl>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-36'/>
-    <type-decl name='void' id='type-id-6'/>
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-135'/>
     <qualified-type-def type-id='type-id-113' const='yes' id='type-id-343'/>
     <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-114'/>
@@ -18118,7 +18113,6 @@
         <enumerator name='round_toward_neg_infinity' value='3'/>
       </enum-decl>
     </namespace-decl>
-    <type-decl name='void' id='type-id-6'/>
     <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-486'/>
     <type-decl name='long unsigned int' size-in-bits='64' id='type-id-36'/>
     <type-decl name='enum-result-underlying-type' size-in-bits='32' alignment-in-bits='32' id='type-id-451'/>
@@ -19193,7 +19187,6 @@
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
     </namespace-decl>
-    <type-decl name='void' id='type-id-6'/>
     <function-decl name='abort' filepath='/usr/include/stdlib.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>