[06/27] Don't strip typedefs in fn names when pretty-printing and comparing

diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index d0fafd02..abc1b145 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -8848,10 +8848,7 @@  get_function_type_name(const function_type& fn_type,
   // canonicalization), we want its representation to stay the same,
   // regardless of typedefs.  So let's strip typedefs from the return
   // type.
-  type_base_sptr return_type =
-    internal
-    ? peel_typedef_type(fn_type.get_return_type())
-    : fn_type.get_return_type();
+  type_base_sptr return_type = fn_type.get_return_type();
   const environment& env = fn_type.get_environment();
 
   o <<  get_type_name(return_type, /*qualified=*/true, internal) << " ";
@@ -8939,10 +8936,8 @@  get_method_type_name(const method_type& fn_type,
   // canonicalization), we want its representation to stay the same,
   // regardless of typedefs.  So let's strip typedefs from the return
   // type.
-  type_base_sptr return_type =
-    internal
-    ? peel_typedef_type(fn_type.get_return_type())
-    : fn_type.get_return_type();
+  type_base_sptr return_type = fn_type.get_return_type();
+
   const environment& env = fn_type.get_environment();
 
   if (return_type)
@@ -28423,11 +28418,7 @@  stream_pretty_representation_of_fn_parms(const function_type& fn_type,
 	  if (env.is_variadic_parameter_type(type))
 	    o << "...";
 	  else
-	    {
-	      if (internal)
-		type = peel_typedef_type(type);
-	      o << get_type_name(type, qualified, internal);
-	    }
+	    o << get_type_name(type, qualified, internal);
 	}
     }
   o << ")";
@@ -28511,11 +28502,8 @@  add_outer_pointer_to_fn_type_expr(const type_base* p,
   type_base_sptr type;
   stream_pretty_representation_of_fn_parms(*pointed_to_fn, right,
 					   qualified, internal);
-  type_base_sptr return_type =
-    internal
-    ? peel_typedef_type(pointed_to_fn->get_return_type())
-    : pointed_to_fn->get_return_type();
 
+  type_base_sptr return_type = pointed_to_fn->get_return_type();
   string result;
 
   if (is_npaf_type(return_type)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3cb95fdc..90dfc258 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -69,12 +69,6 @@  else
 TESTS += runtestdefaultsupprs.py
 endif
 
-# These tests temporarily fail after the commit that introduced type
-# hashing.  Their failure is due to long standing issues that have
-# been uncovered by the type hashing commit.  Subsequent commits that
-# are logically not related to the type hashing commit will fix the
-# issues and as a result, these test will PASS again.  For now, let's
-# mark them as being XFAIL.
 XFAIL_TESTS = runtestabidiffexit
 
 EXTRA_DIST = \
diff --git a/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt b/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt
index 6d7dd686..2866f16e 100644
--- a/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt
+++ b/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt
@@ -17,7 +17,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                       in pointed to type 'struct SDL_AudioCVT' at SDL12_compat.c:907:1:
                         type name changed from 'SDL_AudioCVT' to 'SDL12_AudioCVT'
                         type size changed from 1024 to 1088 (in bits)
-                        3 data member changes (8 filtered):
+                        3 data member changes (2 filtered):
                           'double len_ratio' offset changed from 288 to 320 (in bits) (by +32 bits)
                           name of 'SDL_AudioCVT::filters' changed to 'SDL12_AudioCVT::filters' at SDL12_compat.c:918:1, offset changed from 352 to 384 (in bits) (by +32 bits)
                           'int filter_index' offset changed from 992 to 1024 (in bits) (by +32 bits)
diff --git a/tests/data/test-abidiff-exit/PR31513/reported/PR31513-reported-report-1.txt b/tests/data/test-abidiff-exit/PR31513/reported/PR31513-reported-report-1.txt
index 97a60244..380ad7c7 100644
--- a/tests/data/test-abidiff-exit/PR31513/reported/PR31513-reported-report-1.txt
+++ b/tests/data/test-abidiff-exit/PR31513/reported/PR31513-reported-report-1.txt
@@ -1,4 +1,4 @@ 
-Functions changes summary: 16 Removed, 0 Changed (22 filtered out), 21 Added functions
+Functions changes summary: 16 Removed, 1 Changed (21 filtered out), 21 Added functions
 Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 Function symbols changes summary: 2 Removed, 2 Added function symbols not referenced by debug info
 Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referenced by debug info
@@ -46,6 +46,24 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method std::vector<char, std::allocator<char> >::reference std::vector<char, std::allocator<char> >::back()'    {_ZNSt6vectorIcSaIcEE4backEv}
   [A] 'method std::vector<char, std::allocator<char> >::reference std::vector<char, std::allocator<char> >::emplace_back<char>()'    {_ZNSt6vectorIcSaIcEE12emplace_backIJcEEERcDpOT_}
 
+1 function with some indirect sub-type change:
+
+  [C] 'method int qiifa::class1::addnums(int, int)' at class1.cpp:24:1 has some indirect sub-type changes:
+    implicit parameter 0 of type 'qiifa::class1*' has sub-type changes:
+      in pointed to type 'class qiifa::class1' at class1.h:27:1:
+        type size hasn't changed
+        1 data member change:
+          type of 'std::vector<char, std::allocator<char> > letters' changed:
+            type size hasn't changed
+            1 base class change:
+              'struct std::_Vector_base<char, std::allocator<char> >' at stl_vector.h:74:1 changed:
+                type size hasn't changed
+                1 data member change:
+                  type of 'std::_Vector_base<char, std::allocator<char> >::_Vector_impl _M_impl' changed:
+                    type size hasn't changed
+                    1 base class insertion:
+                      struct std::_Vector_base<char, std::allocator<char> >::_Vector_impl_data at stl_vector.h:91:1
+
 2 Removed function symbols not referenced by debug info:
 
   [D] _fini
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt
index ad065c1a..91c0f670 100644
--- a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt
@@ -9,5 +9,4 @@  Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       in containing type 'struct S' of pointed-to-member type 'int S::*' at test-ptr-to-mbr2-v1.cc:1:1:
         type name changed from 'S' to 'T'
         type size hasn't changed
-        no data member change (1 filtered);
 
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index cfc6285e..167f7802 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -891,7 +891,7 @@ 
       <return type-id='type-id-7'/>
     </function-decl>
     <!-- unsigned long int dbus_bus_get_unix_user(DBusConnection*, const char*, DBusError*) -->
-    <function-decl name='dbus_bus_get_unix_user' mangled-name='dbus_bus_get_unix_user' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_bus_get_unix_user' hash='ba687bdd05d466a5#2'>
+    <function-decl name='dbus_bus_get_unix_user' mangled-name='dbus_bus_get_unix_user' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_bus_get_unix_user' hash='ba687bdd05d466a5'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='865' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -2353,7 +2353,7 @@ 
     <!-- const DBusMessage* -->
     <pointer-type-def type-id='type-id-152' size-in-bits='64' hash='65225f09c506a5b' id='type-id-153'/>
     <!-- void dbus_message_set_serial(DBusMessage*, dbus_uint32_t) -->
-    <function-decl name='dbus_message_set_serial' mangled-name='dbus_message_set_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_set_serial' hash='648097d4f5419b81#2'>
+    <function-decl name='dbus_message_set_serial' mangled-name='dbus_message_set_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_set_serial' hash='648097d4f5419b81'>
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='254' column='1'/>
       <!-- parameter of type 'typedef dbus_uint32_t' -->
@@ -2369,7 +2369,7 @@ 
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_uint32_t dbus_message_get_serial(DBusMessage*) -->
-    <function-decl name='dbus_message_get_serial' mangled-name='dbus_message_get_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_serial' hash='41b53655394fed34#2'>
+    <function-decl name='dbus_message_get_serial' mangled-name='dbus_message_get_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_serial' hash='41b53655394fed34'>
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1'/>
       <!-- typedef dbus_uint32_t -->
@@ -2385,7 +2385,7 @@ 
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- dbus_uint32_t dbus_message_get_reply_serial(DBusMessage*) -->
-    <function-decl name='dbus_message_get_reply_serial' mangled-name='dbus_message_get_reply_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_reply_serial' hash='41b53655394fed34#2'>
+    <function-decl name='dbus_message_get_reply_serial' mangled-name='dbus_message_get_reply_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_reply_serial' hash='41b53655394fed34'>
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1'/>
       <!-- typedef dbus_uint32_t -->
@@ -3942,7 +3942,7 @@ 
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- unsigned int dbus_watch_get_flags(DBusWatch*) -->
-    <function-decl name='dbus_watch_get_flags' mangled-name='dbus_watch_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_flags' hash='41b53655394fed34#2'>
+    <function-decl name='dbus_watch_get_flags' mangled-name='dbus_watch_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_flags' hash='41b53655394fed34'>
       <!-- parameter of type 'DBusWatch*' -->
       <parameter type-id='type-id-91' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1'/>
       <!-- unsigned int -->
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index a6993ff0..39515bfd 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -6832,7 +6832,7 @@ 
     <!-- int (*)(PQHeapKey, PQHeapKey) -->
     <pointer-type-def type-id='type-id-569' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-552'/>
     <!-- int (*)(PQSortKey, PQSortKey) -->
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-558'/>
+    <pointer-type-def type-id='type-id-570' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-558'/>
     <!-- int (*)(void*, DictListKey, DictListKey) -->
     <pointer-type-def type-id='type-id-571' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-528'/>
     <!-- void (*)(GLUmesh*) -->
@@ -6993,7 +6993,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- int (PQSortKey, PQSortKey) -->
-    <function-type size-in-bits='64' hash='d97f95fe79cacdf1#2' id='type-id-570'>
+    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='type-id-570'>
       <!-- parameter of type 'typedef PQSortKey' -->
       <parameter type-id='type-id-568'/>
       <!-- parameter of type 'typedef PQSortKey' -->
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 3f5b2736..a64e47e9 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3192,7 +3192,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int snprintf(char*, size_t, const char*, ...) -->
-    <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64' hash='c9b95df6dd500340#2'>
+    <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64' hash='c9b95df6dd500340'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-27'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -3453,12 +3453,12 @@ 
       <return type-id='type-id-39'/>
     </function-decl>
     <!-- int getpagesize() -->
-    <function-decl name='getpagesize' filepath='/usr/include/unistd.h' line='992' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='getpagesize' filepath='/usr/include/unistd.h' line='992' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int (void) -->
-    <function-type size-in-bits='64' hash='d97f95fe79cacdf1#2' id='type-id-40'>
+    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='type-id-40'>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
@@ -3554,7 +3554,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int (int) -->
-    <function-type size-in-bits='64' hash='878a7be8e06969cb#2' id='type-id-46'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='type-id-46'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
@@ -4224,7 +4224,7 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
     <!-- void* __asan_internal_memcpy(void*, void*, size_t) -->
-    <function-decl name='__asan_internal_memcpy' mangled-name='__asan_internal_memcpy' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcpy' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__asan_internal_memcpy' mangled-name='__asan_internal_memcpy' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcpy' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'void*' -->
@@ -4235,7 +4235,7 @@ 
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- void* __asan_internal_memset(void*, int, size_t) -->
-    <function-decl name='__asan_internal_memset' mangled-name='__asan_internal_memset' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memset' hash='41b53655394fed34#2'>
+    <function-decl name='__asan_internal_memset' mangled-name='__asan_internal_memset' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memset' hash='41b53655394fed34'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'int' -->
@@ -4246,7 +4246,7 @@ 
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int __asan_internal_memcmp(void*, void*, size_t) -->
-    <function-decl name='__asan_internal_memcmp' mangled-name='__asan_internal_memcmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcmp' hash='41b53655394fed34#2'>
+    <function-decl name='__asan_internal_memcmp' mangled-name='__asan_internal_memcmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcmp' hash='41b53655394fed34'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'void*' -->
@@ -4266,7 +4266,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __asan_internal_strncmp(const char*, const char*, size_t) -->
-    <function-decl name='__asan_internal_strncmp' mangled-name='__asan_internal_strncmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strncmp' hash='c9b95df6dd500340#3'>
+    <function-decl name='__asan_internal_strncmp' mangled-name='__asan_internal_strncmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strncmp' hash='c9b95df6dd500340'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'const char*' -->
@@ -4277,14 +4277,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- size_t __asan_internal_strlen(const char*) -->
-    <function-decl name='__asan_internal_strlen' mangled-name='__asan_internal_strlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strlen' hash='659ced78215eae4a#2'>
+    <function-decl name='__asan_internal_strlen' mangled-name='__asan_internal_strlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strlen' hash='659ced78215eae4a'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- typedef size_t -->
       <return type-id='type-id-11'/>
     </function-decl>
     <!-- size_t __asan_internal_strnlen(const char*, size_t) -->
-    <function-decl name='__asan_internal_strnlen' mangled-name='__asan_internal_strnlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strnlen' hash='4e076abb07cc8f73#2'>
+    <function-decl name='__asan_internal_strnlen' mangled-name='__asan_internal_strnlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strnlen' hash='4e076abb07cc8f73'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4305,7 +4305,7 @@ 
       <return type-id='type-id-91'/>
     </function-type>
     <!-- int (const char*, const char*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' hash='c9b95df6dd500340#2' id='type-id-93'>
+    <function-type size-in-bits='64' hash='c9b95df6dd500340' id='type-id-93'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'const char*' -->
@@ -5261,7 +5261,7 @@ 
       <return type-id='type-id-163'/>
     </function-type>
     <!-- int (void*) -->
-    <function-type size-in-bits='64' hash='d97f95fe79cacdf1#2' id='type-id-254'>
+    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='type-id-254'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -6457,7 +6457,7 @@ 
     <namespace-decl name='__sanitizer'>
     </namespace-decl>
     <!-- pthread_t pthread_self() -->
-    <function-decl name='pthread_self' filepath='/usr/include/pthread.h' line='267' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb#5'>
+    <function-decl name='pthread_self' filepath='/usr/include/pthread.h' line='267' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb'>
       <!-- typedef pthread_t -->
       <return type-id='type-id-275'/>
     </function-decl>
@@ -6491,12 +6491,12 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- __uid_t getuid() -->
-    <function-decl name='getuid' filepath='/usr/include/unistd.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#4'>
+    <function-decl name='getuid' filepath='/usr/include/unistd.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <!-- typedef __uid_t -->
       <return type-id='type-id-273'/>
     </function-decl>
     <!-- int isatty(int) -->
-    <function-decl name='isatty' filepath='/usr/include/unistd.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb#2'>
+    <function-decl name='isatty' filepath='/usr/include/unistd.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
@@ -6510,7 +6510,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- unsigned int (unsigned int) -->
-    <function-type size-in-bits='64' hash='878a7be8e06969cb#2' id='type-id-282'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='type-id-282'>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-188'/>
       <!-- unsigned int -->
@@ -7043,7 +7043,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int getdtablesize() -->
-    <function-decl name='getdtablesize' filepath='/usr/include/unistd.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='getdtablesize' filepath='/usr/include/unistd.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -8264,7 +8264,7 @@ 
     <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
     <pointer-type-def type-id='type-id-1000' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-734'/>
     <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-736'/>
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-736'/>
     <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_msghdr*, int) -->
     <pointer-type-def type-id='type-id-1002' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-824'/>
     <!-- SSIZE_T (*)(int, void*, OFF64_T, OFF64_T) -->
@@ -8272,9 +8272,9 @@ 
     <!-- SSIZE_T (*)(int, void*, SIZE_T) -->
     <pointer-type-def type-id='type-id-1004' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-806'/>
     <!-- SSIZE_T (*)(int, void*, SIZE_T, OFF64_T) -->
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-730'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-730'/>
     <!-- SSIZE_T (*)(int, void*, SIZE_T, OFF_T) -->
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' hash='c66cdd9c5848f363#3' id='type-id-732'/>
+    <pointer-type-def type-id='type-id-1006' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-732'/>
     <!-- ScopedInterceptor* -->
     <pointer-type-def type-id='type-id-431' size-in-bits='64' hash='3bfdd3d1296178e3' id='type-id-1007'/>
     <!-- ScopedInterceptor* const -->
@@ -8592,7 +8592,7 @@ 
     <!-- int (*)(const char*, const char*, SIZE_T) -->
     <pointer-type-def type-id='type-id-1184' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-922'/>
     <!-- int (*)(const char*, const char*, __sanitizer::uptr) -->
-    <pointer-type-def type-id='type-id-93' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-93' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-924'/>
     <!-- int (*)(const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
     <pointer-type-def type-id='type-id-1185' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-484'/>
     <!-- int (*)(const char*, int) -->
@@ -8642,7 +8642,7 @@ 
     <!-- int (*)(int, sigaction_t*, sigaction_t*) -->
     <pointer-type-def type-id='type-id-1206' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-867'/>
     <!-- int (*)(int, unsigned int, void*) -->
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-648'/>
+    <pointer-type-def type-id='type-id-1207' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-648'/>
     <!-- int (*)(int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
     <pointer-type-def type-id='type-id-1208' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-728'/>
     <!-- int (*)(int, void*) -->
@@ -8654,7 +8654,7 @@ 
     <!-- int (*)(int, void*, int, int) -->
     <pointer-type-def type-id='type-id-1212' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-552'/>
     <!-- int (*)(int, void*, unsigned int) -->
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-516'/>
     <!-- int (*)(int, void*, unsigned int*) -->
     <pointer-type-def type-id='type-id-1214' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-504'/>
     <!-- int (*)(int, void*, unsigned int*, int) -->
@@ -8662,7 +8662,7 @@ 
     <!-- int (*)(int, void*, void*) -->
     <pointer-type-def type-id='type-id-1216' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-861'/>
     <!-- int (*)(long_t) -->
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-949'/>
+    <pointer-type-def type-id='type-id-1217' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-949'/>
     <!-- int (*)(unsigned int, int) -->
     <pointer-type-def type-id='type-id-1218' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-567'/>
     <!-- int (*)(void (*)(int, void*), void*) -->
@@ -8674,7 +8674,7 @@ 
     <!-- int (*)(void) -->
     <pointer-type-def type-id='type-id-40' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-706'/>
     <!-- int (*)(void*) -->
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-493'/>
     <!-- int (*)(void**, __sanitizer::uptr, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-1221' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-724'/>
     <!-- int (*)(void**, int) -->
@@ -8706,7 +8706,7 @@ 
     <!-- int (*)(void*, long int*) -->
     <pointer-type-def type-id='type-id-1235' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-667'/>
     <!-- int (*)(void*, long_t) -->
-    <pointer-type-def type-id='type-id-1236' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-708'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-708'/>
     <!-- int (*)(void*, void (*)(void)) -->
     <pointer-type-def type-id='type-id-1237' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-775'/>
     <!-- int (*)(void*, void*) -->
@@ -8718,7 +8718,7 @@ 
     <!-- int (*)(void*, void*, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-94' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-684'/>
     <!-- int (*)(void*, void*, unsigned int) -->
-    <pointer-type-def type-id='type-id-1240' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-750'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-750'/>
     <!-- int (*)(void*, void*, void* (*)(void*), void*) -->
     <pointer-type-def type-id='type-id-1241' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-760'/>
     <!-- int (*)(void*, void*, void*) -->
@@ -8742,9 +8742,9 @@ 
     <!-- long int* -->
     <pointer-type-def type-id='type-id-42' size-in-bits='64' hash='9028994eadde34f6#2' id='type-id-1251'/>
     <!-- long_t (*)(int, void*, int) -->
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-859'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-859'/>
     <!-- long_t (*)(int, void*, long_t, int) -->
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-1253' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-822'/>
     <!-- my_siginfo_t* -->
     <pointer-type-def type-id='type-id-445' size-in-bits='64' hash='56f2b28d742224a3' id='type-id-1254'/>
     <!-- sanitizer_kernel_iovec* -->
@@ -8810,7 +8810,7 @@ 
     <!-- void* (*)(void*, long_t, int, int, int, __sanitizer::u64) -->
     <pointer-type-def type-id='type-id-1279' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-695'/>
     <!-- void* (*)(void*, long_t, int, int, int, unsigned int) -->
-    <pointer-type-def type-id='type-id-1280' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-697'/>
+    <pointer-type-def type-id='type-id-1280' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-697'/>
     <!-- void* (*)(void*, void*, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-96' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-686'/>
     <!-- volatile __sanitizer::atomic_uint32_t -->
@@ -9476,7 +9476,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_strncmp(const char*, const char*, __sanitizer::uptr) -->
-    <function-decl name='__interceptor_strncmp' mangled-name='__interceptor_strncmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncmp' hash='c9b95df6dd500340#2'>
+    <function-decl name='__interceptor_strncmp' mangled-name='__interceptor_strncmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncmp' hash='c9b95df6dd500340'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'const char*' -->
@@ -9545,7 +9545,7 @@ 
       <return type-id='type-id-466'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_pread(int, void*, SIZE_T, OFF_T) -->
-    <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread' hash='3e037c50bc1cf9e7#3'>
+    <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread' hash='3e037c50bc1cf9e7'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9558,7 +9558,7 @@ 
       <return type-id='type-id-466'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_pread64(int, void*, SIZE_T, OFF64_T) -->
-    <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64' hash='3e037c50bc1cf9e7#2'>
+    <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64' hash='3e037c50bc1cf9e7'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9582,7 +9582,7 @@ 
       <return type-id='type-id-466'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_preadv(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
-    <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv' hash='20d3d8148d4164fa#2'>
+    <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv' hash='20d3d8148d4164fa'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
@@ -9619,7 +9619,7 @@ 
       <return type-id='type-id-466'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_pwrite(int, void*, SIZE_T, OFF_T) -->
-    <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite' hash='3e037c50bc1cf9e7#3'>
+    <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite' hash='3e037c50bc1cf9e7'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9656,7 +9656,7 @@ 
       <return type-id='type-id-466'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_pwritev(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
-    <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev' hash='20d3d8148d4164fa#2'>
+    <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev' hash='20d3d8148d4164fa'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
@@ -9897,7 +9897,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_ioctl(int, unsigned int, void*) -->
-    <function-decl name='__interceptor_ioctl' mangled-name='__interceptor_ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ioctl' hash='8cead6bbcfb9a639#2'>
+    <function-decl name='__interceptor_ioctl' mangled-name='__interceptor_ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ioctl' hash='8cead6bbcfb9a639'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9975,7 +9975,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_waitpid(int, int*, int) -->
-    <function-decl name='__interceptor_waitpid' mangled-name='__interceptor_waitpid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitpid' hash='5ea177ff0b0204e9#2'>
+    <function-decl name='__interceptor_waitpid' mangled-name='__interceptor_waitpid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitpid' hash='5ea177ff0b0204e9'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <!-- parameter of type 'int*' -->
@@ -10259,7 +10259,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sysinfo(void*) -->
-    <function-decl name='__interceptor_sysinfo' mangled-name='__interceptor_sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sysinfo' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sysinfo' mangled-name='__interceptor_sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sysinfo' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -10672,14 +10672,14 @@ 
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int __interceptor_pthread_mutex_lock(void*) -->
-    <function-decl name='__interceptor_pthread_mutex_lock' mangled-name='__interceptor_pthread_mutex_lock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_lock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_lock' mangled-name='__interceptor_pthread_mutex_lock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_lock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_mutex_unlock(void*) -->
-    <function-decl name='__interceptor_pthread_mutex_unlock' mangled-name='__interceptor_pthread_mutex_unlock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_unlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_unlock' mangled-name='__interceptor_pthread_mutex_unlock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_unlock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -10704,14 +10704,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_cond_signal(void*) -->
-    <function-decl name='__interceptor_pthread_cond_signal' mangled-name='__interceptor_pthread_cond_signal' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_signal' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_cond_signal' mangled-name='__interceptor_pthread_cond_signal' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_signal' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_cond_broadcast(void*) -->
-    <function-decl name='__interceptor_pthread_cond_broadcast' mangled-name='__interceptor_pthread_cond_broadcast' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_broadcast' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_cond_broadcast' mangled-name='__interceptor_pthread_cond_broadcast' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_broadcast' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19304,14 +19304,14 @@ 
       <typedef-decl name='u16' type-id='type-id-247' size-in-bits='16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='67' column='1' hash='c392bb1926b4b6c2' id='type-id-1293'/>
     </namespace-decl>
     <!-- int pthread_attr_init(void*) -->
-    <function-decl name='pthread_attr_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='pthread_attr_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int pthread_attr_destroy(void*) -->
-    <function-decl name='pthread_attr_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='pthread_attr_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19327,7 +19327,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int pthread_setspecific(unsigned int, void*) -->
-    <function-decl name='pthread_setspecific' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='47' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb#2'>
+    <function-decl name='pthread_setspecific' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='47' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb'>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-188'/>
       <!-- parameter of type 'void*' -->
@@ -19345,7 +19345,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int pthread_yield() -->
-    <function-decl name='pthread_yield' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='pthread_yield' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -19366,7 +19366,7 @@ 
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int fileno_unlocked(void*) -->
-    <function-decl name='fileno_unlocked' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='fileno_unlocked' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19407,14 +19407,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- unsigned int __interceptor_sleep(unsigned int) -->
-    <function-decl name='__interceptor_sleep' mangled-name='__interceptor_sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sleep' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_sleep' mangled-name='__interceptor_sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sleep' hash='878a7be8e06969cb'>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-188'/>
       <!-- unsigned int -->
       <return type-id='type-id-188'/>
     </function-decl>
     <!-- int __interceptor_usleep(long_t) -->
-    <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep' hash='41b53655394fed34#3'>
+    <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep' hash='41b53655394fed34'>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
       <!-- int -->
@@ -19439,7 +19439,7 @@ 
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int __interceptor_dlclose(void*) -->
-    <function-decl name='__interceptor_dlclose' mangled-name='__interceptor_dlclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlclose' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_dlclose' mangled-name='__interceptor_dlclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlclose' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19473,28 +19473,28 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_setjmp(void*) -->
-    <function-decl name='__interceptor_setjmp' mangled-name='__interceptor_setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_setjmp' mangled-name='__interceptor_setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setjmp' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor__setjmp(void*) -->
-    <function-decl name='__interceptor__setjmp' mangled-name='__interceptor__setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__setjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor__setjmp' mangled-name='__interceptor__setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__setjmp' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sigsetjmp(void*) -->
-    <function-decl name='__interceptor_sigsetjmp' mangled-name='__interceptor_sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsetjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sigsetjmp' mangled-name='__interceptor_sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsetjmp' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor___sigsetjmp(void*) -->
-    <function-decl name='__interceptor___sigsetjmp' mangled-name='__interceptor___sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___sigsetjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor___sigsetjmp' mangled-name='__interceptor___sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___sigsetjmp' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19774,7 +19774,7 @@ 
       <return type-id='type-id-27'/>
     </function-decl>
     <!-- void* __interceptor_mmap(void*, long_t, int, int, int, unsigned int) -->
-    <function-decl name='__interceptor_mmap' mangled-name='__interceptor_mmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mmap' hash='4c318d5d67c5b956#2'>
+    <function-decl name='__interceptor_mmap' mangled-name='__interceptor_mmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mmap' hash='4c318d5d67c5b956'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <!-- parameter of type 'typedef long_t' -->
@@ -19808,7 +19808,7 @@ 
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int __interceptor_munmap(void*, long_t) -->
-    <function-decl name='__interceptor_munmap' mangled-name='__interceptor_munmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munmap' hash='41b53655394fed34#2'>
+    <function-decl name='__interceptor_munmap' mangled-name='__interceptor_munmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munmap' hash='41b53655394fed34'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <!-- parameter of type 'typedef long_t' -->
@@ -19894,7 +19894,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_detach(void*) -->
-    <function-decl name='__interceptor_pthread_detach' mangled-name='__interceptor_pthread_detach' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_detach' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_detach' mangled-name='__interceptor_pthread_detach' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_detach' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19910,14 +19910,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_mutex_destroy(void*) -->
-    <function-decl name='__interceptor_pthread_mutex_destroy' mangled-name='__interceptor_pthread_mutex_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_destroy' mangled-name='__interceptor_pthread_mutex_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_destroy' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_mutex_trylock(void*) -->
-    <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='__interceptor_pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_trylock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='__interceptor_pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_trylock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19942,28 +19942,28 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_spin_destroy(void*) -->
-    <function-decl name='__interceptor_pthread_spin_destroy' mangled-name='__interceptor_pthread_spin_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_destroy' mangled-name='__interceptor_pthread_spin_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_destroy' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_spin_lock(void*) -->
-    <function-decl name='__interceptor_pthread_spin_lock' mangled-name='__interceptor_pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_lock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_lock' mangled-name='__interceptor_pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_lock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_spin_trylock(void*) -->
-    <function-decl name='__interceptor_pthread_spin_trylock' mangled-name='__interceptor_pthread_spin_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_trylock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_trylock' mangled-name='__interceptor_pthread_spin_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_trylock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_spin_unlock(void*) -->
-    <function-decl name='__interceptor_pthread_spin_unlock' mangled-name='__interceptor_pthread_spin_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_unlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_unlock' mangled-name='__interceptor_pthread_spin_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_unlock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -19979,21 +19979,21 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_rwlock_destroy(void*) -->
-    <function-decl name='__interceptor_pthread_rwlock_destroy' mangled-name='__interceptor_pthread_rwlock_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_destroy' mangled-name='__interceptor_pthread_rwlock_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_destroy' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_rwlock_rdlock(void*) -->
-    <function-decl name='__interceptor_pthread_rwlock_rdlock' mangled-name='__interceptor_pthread_rwlock_rdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_rdlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_rdlock' mangled-name='__interceptor_pthread_rwlock_rdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_rdlock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_rwlock_tryrdlock(void*) -->
-    <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='__interceptor_pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_tryrdlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='__interceptor_pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_tryrdlock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20009,14 +20009,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_rwlock_wrlock(void*) -->
-    <function-decl name='__interceptor_pthread_rwlock_wrlock' mangled-name='__interceptor_pthread_rwlock_wrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_wrlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_wrlock' mangled-name='__interceptor_pthread_rwlock_wrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_wrlock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_rwlock_trywrlock(void*) -->
-    <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='__interceptor_pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_trywrlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='__interceptor_pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_trywrlock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20032,14 +20032,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_rwlock_unlock(void*) -->
-    <function-decl name='__interceptor_pthread_rwlock_unlock' mangled-name='__interceptor_pthread_rwlock_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_unlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_unlock' mangled-name='__interceptor_pthread_rwlock_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_unlock' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_cond_destroy(void*) -->
-    <function-decl name='__interceptor_pthread_cond_destroy' mangled-name='__interceptor_pthread_cond_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_cond_destroy' mangled-name='__interceptor_pthread_cond_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_destroy' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20057,7 +20057,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_barrier_init(void*, void*, unsigned int) -->
-    <function-decl name='__interceptor_pthread_barrier_init' mangled-name='__interceptor_pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_init' hash='878a7be8e06969cb#3'>
+    <function-decl name='__interceptor_pthread_barrier_init' mangled-name='__interceptor_pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_init' hash='878a7be8e06969cb'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -20068,14 +20068,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_barrier_destroy(void*) -->
-    <function-decl name='__interceptor_pthread_barrier_destroy' mangled-name='__interceptor_pthread_barrier_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_barrier_destroy' mangled-name='__interceptor_pthread_barrier_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_destroy' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_pthread_barrier_wait(void*) -->
-    <function-decl name='__interceptor_pthread_barrier_wait' mangled-name='__interceptor_pthread_barrier_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_wait' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_barrier_wait' mangled-name='__interceptor_pthread_barrier_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_wait' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20102,21 +20102,21 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sem_destroy(void*) -->
-    <function-decl name='__interceptor_sem_destroy' mangled-name='__interceptor_sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_destroy' mangled-name='__interceptor_sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_destroy' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sem_wait(void*) -->
-    <function-decl name='__interceptor_sem_wait' mangled-name='__interceptor_sem_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_wait' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_wait' mangled-name='__interceptor_sem_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_wait' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sem_trywait(void*) -->
-    <function-decl name='__interceptor_sem_trywait' mangled-name='__interceptor_sem_trywait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_trywait' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_trywait' mangled-name='__interceptor_sem_trywait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_trywait' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20132,7 +20132,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sem_post(void*) -->
-    <function-decl name='__interceptor_sem_post' mangled-name='__interceptor_sem_post' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_post' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_post' mangled-name='__interceptor_sem_post' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_post' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20308,7 +20308,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_dup(int) -->
-    <function-decl name='__interceptor_dup' mangled-name='__interceptor_dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_dup' mangled-name='__interceptor_dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
@@ -20355,14 +20355,14 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_inotify_init(int) -->
-    <function-decl name='__interceptor_inotify_init' mangled-name='__interceptor_inotify_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_inotify_init' mangled-name='__interceptor_inotify_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_inotify_init1(int) -->
-    <function-decl name='__interceptor_inotify_init1' mangled-name='__interceptor_inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init1' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_inotify_init1' mangled-name='__interceptor_inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init1' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
@@ -20393,7 +20393,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_connect(int, void*, unsigned int) -->
-    <function-decl name='__interceptor_connect' mangled-name='__interceptor_connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_connect' hash='8cead6bbcfb9a639#2'>
+    <function-decl name='__interceptor_connect' mangled-name='__interceptor_connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_connect' hash='8cead6bbcfb9a639'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -20404,7 +20404,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_bind(int, void*, unsigned int) -->
-    <function-decl name='__interceptor_bind' mangled-name='__interceptor_bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_bind' hash='8cead6bbcfb9a639#2'>
+    <function-decl name='__interceptor_bind' mangled-name='__interceptor_bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_bind' hash='8cead6bbcfb9a639'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -20424,28 +20424,28 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_epoll_create(int) -->
-    <function-decl name='__interceptor_epoll_create' mangled-name='__interceptor_epoll_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_epoll_create' mangled-name='__interceptor_epoll_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_epoll_create1(int) -->
-    <function-decl name='__interceptor_epoll_create1' mangled-name='__interceptor_epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create1' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_epoll_create1' mangled-name='__interceptor_epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create1' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_close(int) -->
-    <function-decl name='__interceptor_close' mangled-name='__interceptor_close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_close' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_close' mangled-name='__interceptor_close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_close' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor___close(int) -->
-    <function-decl name='__interceptor___close' mangled-name='__interceptor___close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___close' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor___close' mangled-name='__interceptor___close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___close' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
@@ -20477,7 +20477,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- long_t __interceptor_send(int, void*, long_t, int) -->
-    <function-decl name='__interceptor_send' mangled-name='__interceptor_send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_send' hash='46a36be02626e010#2'>
+    <function-decl name='__interceptor_send' mangled-name='__interceptor_send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_send' hash='46a36be02626e010'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -20490,7 +20490,7 @@ 
       <return type-id='type-id-664'/>
     </function-decl>
     <!-- long_t __interceptor_sendmsg(int, void*, int) -->
-    <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg' hash='a0b5632155c5a0df#2'>
+    <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg' hash='a0b5632155c5a0df'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -20501,7 +20501,7 @@ 
       <return type-id='type-id-664'/>
     </function-decl>
     <!-- long_t __interceptor_recv(int, void*, long_t, int) -->
-    <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv' hash='46a36be02626e010#2'>
+    <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv' hash='46a36be02626e010'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -20541,7 +20541,7 @@ 
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int __interceptor_fclose(void*) -->
-    <function-decl name='__interceptor_fclose' mangled-name='__interceptor_fclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fclose' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_fclose' mangled-name='__interceptor_fclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fclose' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20574,7 +20574,7 @@ 
       <return type-id='type-id-91'/>
     </function-decl>
     <!-- int __interceptor_fflush(void*) -->
-    <function-decl name='__interceptor_fflush' mangled-name='__interceptor_fflush' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fflush' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_fflush' mangled-name='__interceptor_fflush' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fflush' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -20588,7 +20588,7 @@ 
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int __interceptor_puts(const char*) -->
-    <function-decl name='__interceptor_puts' mangled-name='__interceptor_puts' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_puts' hash='41b53655394fed34#2'>
+    <function-decl name='__interceptor_puts' mangled-name='__interceptor_puts' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_puts' hash='41b53655394fed34'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1'/>
       <!-- int -->
@@ -20662,7 +20662,7 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_raise(int) -->
-    <function-decl name='__interceptor_raise' mangled-name='__interceptor_raise' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_raise' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_raise' mangled-name='__interceptor_raise' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_raise' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
@@ -20727,19 +20727,19 @@ 
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_mlockall(int) -->
-    <function-decl name='__interceptor_mlockall' mangled-name='__interceptor_mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mlockall' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_mlockall' mangled-name='__interceptor_mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mlockall' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_munlockall() -->
-    <function-decl name='__interceptor_munlockall' mangled-name='__interceptor_munlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munlockall' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_munlockall' mangled-name='__interceptor_munlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munlockall' hash='d97f95fe79cacdf1'>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_fork(int) -->
-    <function-decl name='__interceptor_fork' mangled-name='__interceptor_fork' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fork' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_fork' mangled-name='__interceptor_fork' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fork' hash='878a7be8e06969cb'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
@@ -21505,7 +21505,7 @@ 
       <return type-id='type-id-466'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
-    <function-type size-in-bits='64' hash='20d3d8148d4164fa#2' id='type-id-1001'>
+    <function-type size-in-bits='64' hash='20d3d8148d4164fa' id='type-id-1001'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
@@ -21553,7 +21553,7 @@ 
       <return type-id='type-id-466'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T, OFF64_T) -->
-    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7#2' id='type-id-1005'>
+    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7' id='type-id-1005'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21566,7 +21566,7 @@ 
       <return type-id='type-id-466'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T, OFF_T) -->
-    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7#3' id='type-id-1006'>
+    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7' id='type-id-1006'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22210,7 +22210,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*) -->
-    <function-type size-in-bits='64' hash='41b53655394fed34#2' id='type-id-1182'>
+    <function-type size-in-bits='64' hash='41b53655394fed34' id='type-id-1182'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1'/>
       <!-- int -->
@@ -22367,7 +22367,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int*, int) -->
-    <function-type size-in-bits='64' hash='5ea177ff0b0204e9#2' id='type-id-1198'>
+    <function-type size-in-bits='64' hash='5ea177ff0b0204e9' id='type-id-1198'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <!-- parameter of type 'int*' -->
@@ -22478,7 +22478,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, unsigned int, void*) -->
-    <function-type size-in-bits='64' hash='8cead6bbcfb9a639#2' id='type-id-1207'>
+    <function-type size-in-bits='64' hash='8cead6bbcfb9a639' id='type-id-1207'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -22548,7 +22548,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*, unsigned int) -->
-    <function-type size-in-bits='64' hash='8cead6bbcfb9a639#2' id='type-id-1213'>
+    <function-type size-in-bits='64' hash='8cead6bbcfb9a639' id='type-id-1213'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22594,7 +22594,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (long_t) -->
-    <function-type size-in-bits='64' hash='41b53655394fed34#3' id='type-id-1217'>
+    <function-type size-in-bits='64' hash='41b53655394fed34' id='type-id-1217'>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
       <!-- int -->
@@ -22790,7 +22790,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, long_t) -->
-    <function-type size-in-bits='64' hash='41b53655394fed34#2' id='type-id-1236'>
+    <function-type size-in-bits='64' hash='41b53655394fed34' id='type-id-1236'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <!-- parameter of type 'typedef long_t' -->
@@ -22828,7 +22828,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, unsigned int) -->
-    <function-type size-in-bits='64' hash='878a7be8e06969cb#3' id='type-id-1240'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='type-id-1240'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22912,7 +22912,7 @@ 
       <return type-id='type-id-438'/>
     </function-type>
     <!-- long_t (int, void*, int) -->
-    <function-type size-in-bits='64' hash='a0b5632155c5a0df#2' id='type-id-1252'>
+    <function-type size-in-bits='64' hash='a0b5632155c5a0df' id='type-id-1252'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22923,7 +22923,7 @@ 
       <return type-id='type-id-664'/>
     </function-type>
     <!-- long_t (int, void*, long_t, int) -->
-    <function-type size-in-bits='64' hash='46a36be02626e010#2' id='type-id-1253'>
+    <function-type size-in-bits='64' hash='46a36be02626e010' id='type-id-1253'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -23110,7 +23110,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (void*, long_t, int, int, int, unsigned int) -->
-    <function-type size-in-bits='64' hash='4c318d5d67c5b956#2' id='type-id-1280'>
+    <function-type size-in-bits='64' hash='4c318d5d67c5b956' id='type-id-1280'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <!-- parameter of type 'typedef long_t' -->
@@ -23708,7 +23708,7 @@ 
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int RunningOnValgrind() -->
-    <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind' hash='d97f95fe79cacdf1'>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -26263,7 +26263,7 @@ 
     <namespace-decl name='__sanitizer'>
     </namespace-decl>
     <!-- void __tsan_java_init(jptr, jptr) -->
-    <function-decl name='__tsan_java_init' mangled-name='__tsan_java_init' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_init' hash='659ced78215eae4a#2'>
+    <function-decl name='__tsan_java_init' mangled-name='__tsan_java_init' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_init' hash='659ced78215eae4a'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <!-- parameter of type 'typedef jptr' -->
@@ -26272,12 +26272,12 @@ 
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int __tsan_java_fini() -->
-    <function-decl name='__tsan_java_fini' mangled-name='__tsan_java_fini' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_fini' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__tsan_java_fini' mangled-name='__tsan_java_fini' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_fini' hash='d97f95fe79cacdf1'>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- void __tsan_java_alloc(jptr, jptr) -->
-    <function-decl name='__tsan_java_alloc' mangled-name='__tsan_java_alloc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_alloc' hash='659ced78215eae4a#2'>
+    <function-decl name='__tsan_java_alloc' mangled-name='__tsan_java_alloc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_alloc' hash='659ced78215eae4a'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <!-- parameter of type 'typedef jptr' -->
@@ -26286,7 +26286,7 @@ 
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void __tsan_java_free(jptr, jptr) -->
-    <function-decl name='__tsan_java_free' mangled-name='__tsan_java_free' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_free' hash='659ced78215eae4a#2'>
+    <function-decl name='__tsan_java_free' mangled-name='__tsan_java_free' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_free' hash='659ced78215eae4a'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <!-- parameter of type 'typedef jptr' -->
@@ -26306,28 +26306,28 @@ 
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void __tsan_java_mutex_lock(jptr) -->
-    <function-decl name='__tsan_java_mutex_lock' mangled-name='__tsan_java_mutex_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_lock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_lock' mangled-name='__tsan_java_mutex_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_lock' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void __tsan_java_mutex_unlock(jptr) -->
-    <function-decl name='__tsan_java_mutex_unlock' mangled-name='__tsan_java_mutex_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_unlock' mangled-name='__tsan_java_mutex_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void __tsan_java_mutex_read_lock(jptr) -->
-    <function-decl name='__tsan_java_mutex_read_lock' mangled-name='__tsan_java_mutex_read_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_lock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_read_lock' mangled-name='__tsan_java_mutex_read_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_lock' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void __tsan_java_mutex_read_unlock(jptr) -->
-    <function-decl name='__tsan_java_mutex_read_unlock' mangled-name='__tsan_java_mutex_read_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_unlock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_read_unlock' mangled-name='__tsan_java_mutex_read_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_unlock' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <!-- void -->
@@ -26343,7 +26343,7 @@ 
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int __tsan_java_mutex_unlock_rec(jptr) -->
-    <function-decl name='__tsan_java_mutex_unlock_rec' mangled-name='__tsan_java_mutex_unlock_rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock_rec' hash='41b53655394fed34#2'>
+    <function-decl name='__tsan_java_mutex_unlock_rec' mangled-name='__tsan_java_mutex_unlock_rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock_rec' hash='41b53655394fed34'>
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1'/>
       <!-- int -->
@@ -28299,7 +28299,7 @@ 
     <namespace-decl name='__tsan'>
     </namespace-decl>
     <!-- long int strtol(const char*, char**, int) -->
-    <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64' hash='530ff15a20e9eac8#3'>
+    <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64' hash='530ff15a20e9eac8'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'char**' -->
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index dad3f30e..7fb8cbce 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -1687,7 +1687,7 @@ 
     <!-- unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-166' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-128'/>
     <!-- unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-167' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-130'/>
     <!-- struct hb_font_t -->
     <class-decl name='hb_font_t' is-struct='yes' visibility='default' size-in-bits='1536' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' hash='de2f93e7fecfc982' id='type-id-120'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -1895,7 +1895,7 @@ 
       <return type-id='type-id-18'/>
     </function-type>
     <!-- unsigned int (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' hash='89d05a3a3b484799#2' id='type-id-167'>
+    <function-type size-in-bits='64' hash='89d05a3a3b484799' id='type-id-167'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-91'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -2180,7 +2180,7 @@ 
       <return type-id='type-id-33'/>
     </function-decl>
     <!-- unsigned int hb_buffer_get_length(hb_buffer_t*) -->
-    <function-decl name='hb_buffer_get_length' mangled-name='hb_buffer_get_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_length' hash='41b53655394fed34#2'>
+    <function-decl name='hb_buffer_get_length' mangled-name='hb_buffer_get_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_length' hash='41b53655394fed34'>
       <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-156' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
       <!-- unsigned int -->
@@ -4123,7 +4123,7 @@ 
       <return type-id='type-id-68'/>
     </function-decl>
     <!-- void hb_font_funcs_set_glyph_v_advance_func(hb_font_funcs_t*, hb_font_get_glyph_v_advance_func_t, void*, hb_destroy_func_t) -->
-    <function-decl name='hb_font_funcs_set_glyph_v_advance_func' mangled-name='hb_font_funcs_set_glyph_v_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_advance_func' hash='4e076abb07cc8f73#2'>
+    <function-decl name='hb_font_funcs_set_glyph_v_advance_func' mangled-name='hb_font_funcs_set_glyph_v_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_advance_func' hash='4e076abb07cc8f73'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
       <parameter type-id='type-id-170' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_advance_func_t' -->
@@ -4136,7 +4136,7 @@ 
       <return type-id='type-id-68'/>
     </function-decl>
     <!-- void hb_font_funcs_set_glyph_v_kerning_func(hb_font_funcs_t*, hb_font_get_glyph_v_kerning_func_t, void*, hb_destroy_func_t) -->
-    <function-decl name='hb_font_funcs_set_glyph_v_kerning_func' mangled-name='hb_font_funcs_set_glyph_v_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_kerning_func' hash='4e076abb07cc8f73#2'>
+    <function-decl name='hb_font_funcs_set_glyph_v_kerning_func' mangled-name='hb_font_funcs_set_glyph_v_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_kerning_func' hash='4e076abb07cc8f73'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
       <parameter type-id='type-id-170' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_kerning_func_t' -->
@@ -4149,7 +4149,7 @@ 
       <return type-id='type-id-68'/>
     </function-decl>
     <!-- void hb_font_funcs_set_glyph_v_origin_func(hb_font_funcs_t*, hb_font_get_glyph_v_origin_func_t, void*, hb_destroy_func_t) -->
-    <function-decl name='hb_font_funcs_set_glyph_v_origin_func' mangled-name='hb_font_funcs_set_glyph_v_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_origin_func' hash='4e076abb07cc8f73#2'>
+    <function-decl name='hb_font_funcs_set_glyph_v_origin_func' mangled-name='hb_font_funcs_set_glyph_v_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_origin_func' hash='4e076abb07cc8f73'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
       <parameter type-id='type-id-170' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_origin_func_t' -->
@@ -13552,7 +13552,7 @@ 
       <return type-id='type-id-33'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_language_get_required_feature_index(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*) -->
-    <function-decl name='hb_ot_layout_language_get_required_feature_index' mangled-name='hb_ot_layout_language_get_required_feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature_index' hash='4c53218d3f024ee6#2'>
+    <function-decl name='hb_ot_layout_language_get_required_feature_index' mangled-name='hb_ot_layout_language_get_required_feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature_index' hash='4c53218d3f024ee6'>
       <!-- parameter of type 'hb_face_t*' -->
       <parameter type-id='type-id-169' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
@@ -14958,7 +14958,7 @@ 
       <return type-id='type-id-68'/>
     </function-decl>
     <!-- unsigned int hb_set_get_population(const hb_set_t*) -->
-    <function-decl name='hb_set_get_population' mangled-name='hb_set_get_population' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_population' hash='41b53655394fed34#2'>
+    <function-decl name='hb_set_get_population' mangled-name='hb_set_get_population' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_population' hash='41b53655394fed34'>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-2531' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1'/>
       <!-- unsigned int -->
@@ -15313,7 +15313,7 @@ 
       <return type-id='type-id-68'/>
     </function-decl>
     <!-- void hb_unicode_funcs_set_mirroring_func(hb_unicode_funcs_t*, hb_unicode_mirroring_func_t, void*, hb_destroy_func_t) -->
-    <function-decl name='hb_unicode_funcs_set_mirroring_func' mangled-name='hb_unicode_funcs_set_mirroring_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_mirroring_func' hash='4e076abb07cc8f73#2'>
+    <function-decl name='hb_unicode_funcs_set_mirroring_func' mangled-name='hb_unicode_funcs_set_mirroring_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_mirroring_func' hash='4e076abb07cc8f73'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-91' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_mirroring_func_t' -->
@@ -15375,7 +15375,7 @@ 
       <return type-id='type-id-78'/>
     </function-decl>
     <!-- unsigned int hb_unicode_eastasian_width(hb_unicode_funcs_t*, hb_codepoint_t) -->
-    <function-decl name='hb_unicode_eastasian_width' mangled-name='hb_unicode_eastasian_width' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_eastasian_width' hash='89d05a3a3b484799#2'>
+    <function-decl name='hb_unicode_eastasian_width' mangled-name='hb_unicode_eastasian_width' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_eastasian_width' hash='89d05a3a3b484799'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-91' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index c0032c2a..8f6889ea 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -7139,7 +7139,7 @@ 
         </data-member>
         <member-function access='public'>
           <!-- std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>& std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>::operator+=(ptrdiff_t) -->
-          <function-decl name='operator+=' mangled-name='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='176' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' hash='659ced78215eae4a#2'>
+          <function-decl name='operator+=' mangled-name='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='176' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' hash='659ced78215eae4a'>
             <!-- implicit parameter of type 'std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>*' -->
             <parameter type-id='type-id-198' is-artificial='yes'/>
             <!-- parameter of type 'typedef ptrdiff_t' -->
@@ -7150,7 +7150,7 @@ 
         </member-function>
         <member-function access='public'>
           <!-- std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*> std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>::operator+(ptrdiff_t) -->
-          <function-decl name='operator+' mangled-name='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='195' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' hash='c0c5e3a61de274ca#3'>
+          <function-decl name='operator+' mangled-name='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='195' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' hash='c0c5e3a61de274ca'>
             <!-- implicit parameter of type 'const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>*' -->
             <parameter type-id='type-id-145' is-artificial='yes'/>
             <!-- parameter of type 'typedef ptrdiff_t' -->
@@ -9607,7 +9607,7 @@ 
       <class-decl name='_Deque_iterator&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' is-struct='yes' visibility='default' hash='ba4ee5c255fbd2eb' id='type-id-555'>
         <member-function access='public'>
           <!-- std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>& std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>::operator+=(ptrdiff_t) -->
-          <function-decl name='operator+=' mangled-name='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='176' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' hash='659ced78215eae4a#2'>
+          <function-decl name='operator+=' mangled-name='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='176' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EpLEl' hash='659ced78215eae4a'>
             <!-- implicit parameter of type 'std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>*' -->
             <parameter type-id='type-id-198' is-artificial='yes'/>
             <!-- parameter of type 'typedef ptrdiff_t' -->
@@ -9618,7 +9618,7 @@ 
         </member-function>
         <member-function access='public'>
           <!-- std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*> std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>::operator+(ptrdiff_t) -->
-          <function-decl name='operator+' mangled-name='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='195' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' hash='c0c5e3a61de274ca#3'>
+          <function-decl name='operator+' mangled-name='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='195' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt15_Deque_iteratorI14vtkPixelExtentRS0_PS0_EplEl' hash='c0c5e3a61de274ca'>
             <!-- implicit parameter of type 'const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>*' -->
             <parameter type-id='type-id-145' is-artificial='yes'/>
             <!-- parameter of type 'typedef ptrdiff_t' -->
@@ -10082,7 +10082,7 @@ 
       <return type-id='type-id-20'/>
     </function-type>
     <!-- std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*> (std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>::*) (ptrdiff_t) -->
-    <function-type method-class-id='type-id-142' size-in-bits='64' hash='c0c5e3a61de274ca#3' id='type-id-622'>
+    <function-type method-class-id='type-id-142' size-in-bits='64' hash='c0c5e3a61de274ca' id='type-id-622'>
       <!-- implicit parameter of type 'const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'typedef ptrdiff_t' -->
@@ -10100,7 +10100,7 @@ 
       <return type-id='type-id-142'/>
     </function-type>
     <!-- std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>& (std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>::*) (ptrdiff_t) -->
-    <function-type method-class-id='type-id-142' size-in-bits='64' hash='659ced78215eae4a#2' id='type-id-624'>
+    <function-type method-class-id='type-id-142' size-in-bits='64' hash='659ced78215eae4a' id='type-id-624'>
       <!-- implicit parameter of type 'std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>*' -->
       <parameter type-id='type-id-198' is-artificial='yes'/>
       <!-- parameter of type 'typedef ptrdiff_t' -->
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 9309f2ab..06711846 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -2804,7 +2804,7 @@ 
       </member-function>
       <member-function access='private' constructor='yes'>
         <!-- ProcMapsIterator::ProcMapsIterator(pid_t) -->
-        <function-decl name='ProcMapsIterator' mangled-name='_ZN16ProcMapsIteratorC1Ei' filepath='src/base/sysinfo.cc' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16ProcMapsIteratorC1Ei' hash='d97f95fe79cacdf1#2'>
+        <function-decl name='ProcMapsIterator' mangled-name='_ZN16ProcMapsIteratorC1Ei' filepath='src/base/sysinfo.cc' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN16ProcMapsIteratorC1Ei' hash='d97f95fe79cacdf1'>
           <!-- implicit parameter of type 'ProcMapsIterator*' -->
           <parameter type-id='type-id-134' is-artificial='yes'/>
           <!-- parameter of type 'typedef pid_t' -->
@@ -2933,7 +2933,7 @@ 
       <return type-id='type-id-59'/>
     </function-decl>
     <!-- void SleepForMilliseconds(int) -->
-    <function-decl name='SleepForMilliseconds' mangled-name='_Z20SleepForMillisecondsi' filepath='src/base/sysinfo.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20SleepForMillisecondsi' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='SleepForMilliseconds' mangled-name='_Z20SleepForMillisecondsi' filepath='src/base/sysinfo.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20SleepForMillisecondsi' hash='d97f95fe79cacdf1'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-1' filepath='src/base/sysinfo.cc' line='226' column='1'/>
       <!-- void -->
@@ -3412,7 +3412,7 @@ 
       <return type-id='type-id-181'/>
     </function-decl>
     <!-- int atoi(const char*) -->
-    <function-decl name='atoi' filepath='/usr/include/stdlib.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64' hash='41b53655394fed34#2'>
+    <function-decl name='atoi' filepath='/usr/include/stdlib.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64' hash='41b53655394fed34'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-60'/>
       <!-- int -->
@@ -4002,7 +4002,7 @@ 
       <return type-id='type-id-58'/>
     </function-type>
     <!-- void* (size_t) -->
-    <function-type size-in-bits='64' hash='8d6dd888776a11fb#2' id='type-id-206'>
+    <function-type size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-206'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void* -->
@@ -4307,14 +4307,14 @@ 
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- int tcmalloc::AlignmentForSize(size_t) -->
-      <function-decl name='AlignmentForSize' mangled-name='_ZN8tcmalloc16AlignmentForSizeEm' filepath='src/common.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc16AlignmentForSizeEm' hash='41b53655394fed34#2'>
+      <function-decl name='AlignmentForSize' mangled-name='_ZN8tcmalloc16AlignmentForSizeEm' filepath='src/common.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc16AlignmentForSizeEm' hash='41b53655394fed34'>
         <!-- parameter of type 'typedef size_t' -->
         <parameter type-id='type-id-61'/>
         <!-- int -->
         <return type-id='type-id-1'/>
       </function-decl>
       <!-- void* tcmalloc::MetaDataAlloc(size_t) -->
-      <function-decl name='MetaDataAlloc' mangled-name='_ZN8tcmalloc13MetaDataAllocEm' filepath='src/common.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc13MetaDataAllocEm' hash='8d6dd888776a11fb#2'>
+      <function-decl name='MetaDataAlloc' mangled-name='_ZN8tcmalloc13MetaDataAllocEm' filepath='src/common.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc13MetaDataAllocEm' hash='8d6dd888776a11fb'>
         <!-- parameter of type 'typedef size_t' -->
         <parameter type-id='type-id-61'/>
         <!-- void* -->
@@ -7835,7 +7835,7 @@ 
         </member-function>
         <member-function access='public'>
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reserve(unsigned long int) -->
-          <function-decl name='reserve' mangled-name='_ZNSs7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='502' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb#2'>
+          <function-decl name='reserve' mangled-name='_ZNSs7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='502' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >*' -->
             <parameter type-id='type-id-833' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -8398,7 +8398,7 @@ 
       <return type-id='type-id-58'/>
     </function-type>
     <!-- void (void*, ptrdiff_t) -->
-    <function-type size-in-bits='64' hash='8d6dd888776a11fb#2' id='type-id-902'>
+    <function-type size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-902'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-56'/>
       <!-- parameter of type 'typedef ptrdiff_t' -->
@@ -8504,7 +8504,7 @@ 
       <return type-id='type-id-58'/>
     </function-type>
     <!-- void (std::basic_string<char, std::char_traits<char>, std::allocator<char> >::*) (unsigned long int) -->
-    <function-type method-class-id='type-id-1000' size-in-bits='64' hash='8d6dd888776a11fb#2' id='type-id-1024'>
+    <function-type method-class-id='type-id-1000' size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-1024'>
       <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >*' -->
       <parameter type-id='type-id-833' is-artificial='yes'/>
       <!-- parameter of type 'unsigned long int' -->
@@ -10054,7 +10054,7 @@ 
       <return type-id='type-id-58'/>
     </function-decl>
     <!-- size_t MallocExtension_GetEstimatedAllocatedSize(size_t) -->
-    <function-decl name='MallocExtension_GetEstimatedAllocatedSize' mangled-name='MallocExtension_GetEstimatedAllocatedSize' filepath='src/malloc_extension.cc' line='370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocExtension_GetEstimatedAllocatedSize' hash='659ced78215eae4a#2'>
+    <function-decl name='MallocExtension_GetEstimatedAllocatedSize' mangled-name='MallocExtension_GetEstimatedAllocatedSize' filepath='src/malloc_extension.cc' line='370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocExtension_GetEstimatedAllocatedSize' hash='659ced78215eae4a'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61' filepath='src/malloc_extension.cc' line='370' column='1'/>
       <!-- typedef size_t -->
@@ -10503,14 +10503,14 @@ 
       </namespace-decl>
     </namespace-decl>
     <!-- int MallocHook_AddNewHook(MallocHook_NewHook) -->
-    <function-decl name='MallocHook_AddNewHook' mangled-name='MallocHook_AddNewHook' filepath='src/malloc_hook.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddNewHook' hash='41b53655394fed34#2'>
+    <function-decl name='MallocHook_AddNewHook' mangled-name='MallocHook_AddNewHook' filepath='src/malloc_hook.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_AddNewHook' hash='41b53655394fed34'>
       <!-- parameter of type 'typedef MallocHook_NewHook' -->
       <parameter type-id='type-id-380' filepath='src/malloc_hook.cc' line='302' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int MallocHook_RemoveNewHook(MallocHook_NewHook) -->
-    <function-decl name='MallocHook_RemoveNewHook' mangled-name='MallocHook_RemoveNewHook' filepath='src/malloc_hook.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveNewHook' hash='41b53655394fed34#2'>
+    <function-decl name='MallocHook_RemoveNewHook' mangled-name='MallocHook_RemoveNewHook' filepath='src/malloc_hook.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_RemoveNewHook' hash='41b53655394fed34'>
       <!-- parameter of type 'typedef MallocHook_NewHook' -->
       <parameter type-id='type-id-380' filepath='src/malloc_hook.cc' line='302' column='1'/>
       <!-- int -->
@@ -10643,7 +10643,7 @@ 
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- MallocHook_NewHook MallocHook_SetNewHook(MallocHook_NewHook) -->
-    <function-decl name='MallocHook_SetNewHook' mangled-name='MallocHook_SetNewHook' filepath='src/malloc_hook.cc' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetNewHook' hash='659ced78215eae4a#2'>
+    <function-decl name='MallocHook_SetNewHook' mangled-name='MallocHook_SetNewHook' filepath='src/malloc_hook.cc' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocHook_SetNewHook' hash='659ced78215eae4a'>
       <!-- parameter of type 'typedef MallocHook_NewHook' -->
       <parameter type-id='type-id-380' filepath='src/malloc_hook.cc' line='424' column='1'/>
       <!-- typedef MallocHook_NewHook -->
@@ -10727,7 +10727,7 @@ 
       <return type-id='type-id-56'/>
     </function-decl>
     <!-- void* mmap(void*, size_t, int, int, int, off_t) -->
-    <function-decl name='mmap' mangled-name='mmap' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmap' hash='c106fc1e3b8c4363#2'>
+    <function-decl name='mmap' mangled-name='mmap' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmap' hash='c106fc1e3b8c4363'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-56' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -10804,7 +10804,7 @@ 
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (ptrdiff_t) -->
-    <function-type size-in-bits='64' hash='8d6dd888776a11fb#3' id='type-id-1327'>
+    <function-type size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-1327'>
       <!-- parameter of type 'typedef ptrdiff_t' -->
       <parameter type-id='type-id-352'/>
       <!-- void -->
@@ -12490,7 +12490,7 @@ 
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int ProfilerStart(const char*) -->
-    <function-decl name='ProfilerStart' mangled-name='ProfilerStart' filepath='src/profiler.cc' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerStart' hash='41b53655394fed34#2'>
+    <function-decl name='ProfilerStart' mangled-name='ProfilerStart' filepath='src/profiler.cc' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerStart' hash='41b53655394fed34'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-60'/>
       <!-- int -->
@@ -14944,7 +14944,7 @@ 
     <!-- void* (*)(size_t, void*) -->
     <pointer-type-def type-id='type-id-1940' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-1941'/>
     <!-- void* (*)(unsigned long int) -->
-    <pointer-type-def type-id='type-id-1942' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-1942' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-260'/>
     <!-- void* (*)(void*, size_t, void*) -->
     <pointer-type-def type-id='type-id-1943' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-1944'/>
     <!-- void** -->
@@ -15140,7 +15140,7 @@ 
         </member-function>
         <member-function access='public'>
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reserve(unsigned long int) -->
-          <function-decl name='reserve' mangled-name='_ZNSs7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='502' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb#2'>
+          <function-decl name='reserve' mangled-name='_ZNSs7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='502' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >*' -->
             <parameter type-id='type-id-833' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -16460,7 +16460,7 @@ 
         </member-function>
         <member-function access='private' static='yes'>
           <!-- void tcmalloc::ThreadCache::set_overall_thread_cache_size() -->
-          <function-decl name='set_overall_thread_cache_size' mangled-name='_ZN8tcmalloc11ThreadCache29set_overall_thread_cache_sizeEm' filepath='src/thread_cache.cc' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc11ThreadCache29set_overall_thread_cache_sizeEm' hash='8d6dd888776a11fb#2'>
+          <function-decl name='set_overall_thread_cache_size' mangled-name='_ZN8tcmalloc11ThreadCache29set_overall_thread_cache_sizeEm' filepath='src/thread_cache.cc' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc11ThreadCache29set_overall_thread_cache_sizeEm' hash='8d6dd888776a11fb'>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-61'/>
             <!-- void -->
@@ -16700,7 +16700,7 @@ 
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void* tc_malloc(size_t) -->
-    <function-decl name='tc_malloc' mangled-name='tc_malloc' filepath='src/tcmalloc.cc' line='1573' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_malloc' hash='8d6dd888776a11fb#2'>
+    <function-decl name='tc_malloc' mangled-name='tc_malloc' filepath='src/tcmalloc.cc' line='1573' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_malloc' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void* -->
@@ -16739,7 +16739,7 @@ 
       <return type-id='type-id-56'/>
     </function-decl>
     <!-- void* tc_new(size_t) -->
-    <function-decl name='tc_new' mangled-name='tc_new' filepath='src/tcmalloc.cc' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_new' hash='8d6dd888776a11fb#2'>
+    <function-decl name='tc_new' mangled-name='tc_new' filepath='src/tcmalloc.cc' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_new' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void* -->
@@ -16771,7 +16771,7 @@ 
       <return type-id='type-id-58'/>
     </function-decl>
     <!-- void* tc_newarray(size_t) -->
-    <function-decl name='tc_newarray' mangled-name='tc_newarray' filepath='src/tcmalloc.cc' line='1641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_newarray' hash='8d6dd888776a11fb#2'>
+    <function-decl name='tc_newarray' mangled-name='tc_newarray' filepath='src/tcmalloc.cc' line='1641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_newarray' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void* -->
@@ -16823,14 +16823,14 @@ 
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void* tc_valloc(size_t) -->
-    <function-decl name='tc_valloc' mangled-name='tc_valloc' filepath='src/tcmalloc.cc' line='1696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_valloc' hash='8d6dd888776a11fb#2'>
+    <function-decl name='tc_valloc' mangled-name='tc_valloc' filepath='src/tcmalloc.cc' line='1696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_valloc' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void* -->
       <return type-id='type-id-56'/>
     </function-decl>
     <!-- void* tc_pvalloc(size_t) -->
-    <function-decl name='tc_pvalloc' mangled-name='tc_pvalloc' filepath='src/tcmalloc.cc' line='1704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_pvalloc' hash='8d6dd888776a11fb#2'>
+    <function-decl name='tc_pvalloc' mangled-name='tc_pvalloc' filepath='src/tcmalloc.cc' line='1704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_pvalloc' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void* -->
@@ -16863,7 +16863,7 @@ 
       <return type-id='type-id-61'/>
     </function-decl>
     <!-- void* tc_malloc_skip_new_handler(size_t) -->
-    <function-decl name='tc_malloc_skip_new_handler' mangled-name='tc_malloc_skip_new_handler' filepath='src/tcmalloc.cc' line='1734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_malloc_skip_new_handler' hash='8d6dd888776a11fb#2'>
+    <function-decl name='tc_malloc_skip_new_handler' mangled-name='tc_malloc_skip_new_handler' filepath='src/tcmalloc.cc' line='1734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tc_malloc_skip_new_handler' hash='8d6dd888776a11fb'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void* -->
@@ -16925,7 +16925,7 @@ 
       <return type-id='type-id-56'/>
     </function-type>
     <!-- void* (unsigned long int) -->
-    <function-type size-in-bits='64' hash='8d6dd888776a11fb#3' id='type-id-1942'>
+    <function-type size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-1942'>
       <!-- parameter of type 'unsigned long int' -->
       <parameter type-id='type-id-21'/>
       <!-- void* -->
@@ -16978,7 +16978,7 @@ 
       <return type-id='type-id-58'/>
     </function-type>
     <!-- void (tcmalloc::ThreadCache::*) (size_t) -->
-    <function-type method-class-id='type-id-1890' size-in-bits='64' hash='8d6dd888776a11fb#2' id='type-id-1983'>
+    <function-type method-class-id='type-id-1890' size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-1983'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-61'/>
       <!-- void -->
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 1f80242f..5c5dad86 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -1447,7 +1447,7 @@ 
       </member-function>
       <member-function access='private' vtable-offset='25'>
         <!-- vtkIdType vtkCommunicator::GetCount() -->
-        <function-decl name='GetCount' mangled-name='_ZN15vtkCommunicator8GetCountEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb#2'>
+        <function-decl name='GetCount' mangled-name='_ZN15vtkCommunicator8GetCountEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb'>
           <!-- implicit parameter of type 'vtkCommunicator*' -->
           <parameter type-id='type-id-25' is-artificial='yes'/>
           <!-- typedef vtkIdType -->
@@ -2404,7 +2404,7 @@ 
       </member-function>
       <member-function access='private'>
         <!-- vtkMultiProcessStream& vtkMultiProcessStream::operator<<(vtkTypeUInt64) -->
-        <function-decl name='operator&lt;&lt;' mangled-name='_ZN21vtkMultiProcessStreamlsEy' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN21vtkMultiProcessStreamlsEy' hash='659ced78215eae4a#2'>
+        <function-decl name='operator&lt;&lt;' mangled-name='_ZN21vtkMultiProcessStreamlsEy' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN21vtkMultiProcessStreamlsEy' hash='659ced78215eae4a'>
           <!-- implicit parameter of type 'vtkMultiProcessStream*' -->
           <parameter type-id='type-id-66' is-artificial='yes'/>
           <!-- parameter of type 'typedef vtkTypeUInt64' -->
@@ -2511,7 +2511,7 @@ 
       </member-function>
       <member-function access='private'>
         <!-- vtkMultiProcessStream& vtkMultiProcessStream::operator<<(vtkTypeInt64) -->
-        <function-decl name='operator&lt;&lt;' mangled-name='_ZN21vtkMultiProcessStreamlsEx' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN21vtkMultiProcessStreamlsEx' hash='659ced78215eae4a#2'>
+        <function-decl name='operator&lt;&lt;' mangled-name='_ZN21vtkMultiProcessStreamlsEx' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN21vtkMultiProcessStreamlsEx' hash='659ced78215eae4a'>
           <!-- implicit parameter of type 'vtkMultiProcessStream*' -->
           <parameter type-id='type-id-66' is-artificial='yes'/>
           <!-- parameter of type 'typedef vtkTypeInt64' -->
@@ -4964,7 +4964,7 @@ 
       <return type-id='type-id-29'/>
     </function-type>
     <!-- vtkIdType (vtkCommunicator::*) () -->
-    <function-type method-class-id='type-id-15' size-in-bits='64' hash='8d6dd888776a11fb#2' id='type-id-549'>
+    <function-type method-class-id='type-id-15' size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-549'>
       <!-- implicit parameter of type 'vtkCommunicator*' -->
       <parameter type-id='type-id-25' is-artificial='yes'/>
       <!-- typedef vtkIdType -->
@@ -5124,7 +5124,7 @@ 
       <return type-id='type-id-30'/>
     </function-type>
     <!-- vtkMultiProcessStream& (vtkMultiProcessStream::*) (vtkTypeInt64) -->
-    <function-type method-class-id='type-id-59' size-in-bits='64' hash='659ced78215eae4a#2' id='type-id-567'>
+    <function-type method-class-id='type-id-59' size-in-bits='64' hash='659ced78215eae4a' id='type-id-567'>
       <!-- implicit parameter of type 'vtkMultiProcessStream*' -->
       <parameter type-id='type-id-66' is-artificial='yes'/>
       <!-- parameter of type 'typedef vtkTypeInt64' -->
@@ -5142,7 +5142,7 @@ 
       <return type-id='type-id-30'/>
     </function-type>
     <!-- vtkMultiProcessStream& (vtkMultiProcessStream::*) (vtkTypeUInt64) -->
-    <function-type method-class-id='type-id-59' size-in-bits='64' hash='659ced78215eae4a#2' id='type-id-569'>
+    <function-type method-class-id='type-id-59' size-in-bits='64' hash='659ced78215eae4a' id='type-id-569'>
       <!-- implicit parameter of type 'vtkMultiProcessStream*' -->
       <parameter type-id='type-id-66' is-artificial='yes'/>
       <!-- parameter of type 'typedef vtkTypeUInt64' -->
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index f36a4e59..819a8790 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -2100,7 +2100,7 @@ 
       <return type-id='type-id-99'/>
     </function-type>
     <!-- void* (long int) -->
-    <function-type size-in-bits='64' hash='8d6dd888776a11fb#2' id='type-id-140'>
+    <function-type size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-140'>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-26'/>
       <!-- void* -->
@@ -5176,7 +5176,7 @@ 
       <return type-id='type-id-99'/>
     </function-decl>
     <!-- cpp_hashnode* cpp_lookup(cpp_reader*, const unsigned char*, unsigned int) -->
-    <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/identifiers.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj' hash='530ff15a20e9eac8#2'>
+    <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/identifiers.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj' hash='530ff15a20e9eac8'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-223'/>
       <!-- parameter of type 'const unsigned char*' -->
@@ -7672,7 +7672,7 @@ 
       <return type-id='type-id-99'/>
     </function-decl>
     <!-- void _cpp_backup_tokens_direct(cpp_reader*, unsigned int) -->
-    <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct' hash='648097d4f5419b81#2'>
+    <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct' hash='648097d4f5419b81'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-223'/>
       <!-- parameter of type 'unsigned int' -->
@@ -7681,7 +7681,7 @@ 
       <return type-id='type-id-99'/>
     </function-decl>
     <!-- void _cpp_backup_tokens(cpp_reader*, unsigned int) -->
-    <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj' hash='648097d4f5419b81#2'>
+    <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj' hash='648097d4f5419b81'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-223'/>
       <!-- parameter of type 'unsigned int' -->
diff --git a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
index c72543d7..44cf3bcc 100644
--- a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
+++ b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
@@ -434,7 +434,7 @@ 
       <parameter type-id='type-id-30' name='icp' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='478' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fman_if_set_fdoff' mangled-name='fman_if_set_fdoff' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_fdoff@@DPDK_20.0' hash='648097d4f5419b81#2'>
+    <function-decl name='fman_if_set_fdoff' mangled-name='fman_if_set_fdoff' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fman_if_set_fdoff@@DPDK_20.0' hash='648097d4f5419b81'>
       <parameter type-id='type-id-31' name='fm_if' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1'/>
       <parameter type-id='type-id-8' name='fd_offset' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' line='500' column='1'/>
       <return type-id='type-id-35'/>
@@ -2957,7 +2957,7 @@ 
       <parameter type-id='type-id-131' name='dq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1319' column='1'/>
       <return type-id='type-id-35'/>
     </function-decl>
-    <function-decl name='qman_poll_dqrr' mangled-name='qman_poll_dqrr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_poll_dqrr@@DPDK_20.0' hash='878a7be8e06969cb#2'>
+    <function-decl name='qman_poll_dqrr' mangled-name='qman_poll_dqrr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_poll_dqrr@@DPDK_20.0' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-4' name='limit' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='1330' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -3018,7 +3018,7 @@ 
       <parameter type-id='type-id-8' name='vdqcr_flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2102' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='qman_volatile_dequeue' mangled-name='qman_volatile_dequeue' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_volatile_dequeue@@DPDK_20.0' hash='5314ce831be897df#2'>
+    <function-decl name='qman_volatile_dequeue' mangled-name='qman_volatile_dequeue' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_volatile_dequeue@@DPDK_20.0' hash='5314ce831be897df'>
       <parameter type-id='type-id-211' name='fq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1'/>
       <parameter type-id='type-id-9' name='flags' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2139' column='1'/>
       <parameter type-id='type-id-9' name='vdqcr' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' line='2140' column='1'/>
@@ -5152,7 +5152,7 @@ 
     <pointer-type-def type-id='type-id-726' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-658'/>
     <pointer-type-def type-id='type-id-727' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-664'/>
     <pointer-type-def type-id='type-id-728' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-634'/>
-    <pointer-type-def type-id='type-id-729' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-655'/>
+    <pointer-type-def type-id='type-id-729' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-655'/>
     <pointer-type-def type-id='type-id-730' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-628'/>
     <pointer-type-def type-id='type-id-731' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-630'/>
     <pointer-type-def type-id='type-id-732' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-627'/>
@@ -5187,14 +5187,14 @@ 
     <pointer-type-def type-id='type-id-761' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-650'/>
     <pointer-type-def type-id='type-id-762' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-660'/>
     <pointer-type-def type-id='type-id-763' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-644'/>
-    <pointer-type-def type-id='type-id-764' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-623'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-623'/>
     <pointer-type-def type-id='type-id-765' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-645'/>
     <pointer-type-def type-id='type-id-766' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-638'/>
     <pointer-type-def type-id='type-id-767' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-640'/>
     <pointer-type-def type-id='type-id-348' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-677'/>
     <pointer-type-def type-id='type-id-768' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-678'/>
     <pointer-type-def type-id='type-id-769' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-647'/>
-    <pointer-type-def type-id='type-id-770' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-659'/>
+    <pointer-type-def type-id='type-id-770' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-659'/>
     <pointer-type-def type-id='type-id-483' size-in-bits='64' hash='11fa76aa9227aaf5' id='type-id-501'/>
     <pointer-type-def type-id='type-id-501' size-in-bits='64' hash='c1585ec7bd9ff92a' id='type-id-611'/>
     <pointer-type-def type-id='type-id-499' size-in-bits='64' hash='9f483f8d81e17934' id='type-id-771'/>
@@ -5351,7 +5351,7 @@ 
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' hash='c50376f19f645d5#2' id='type-id-729'>
+    <function-type size-in-bits='64' hash='c50376f19f645d5' id='type-id-729'>
       <parameter type-id='type-id-695'/>
       <parameter type-id='type-id-669'/>
       <return type-id='type-id-1'/>
@@ -5557,7 +5557,7 @@ 
       <parameter type-id='type-id-14'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' hash='89d05a3a3b484799#2' id='type-id-764'>
+    <function-type size-in-bits='64' hash='89d05a3a3b484799' id='type-id-764'>
       <parameter type-id='type-id-695'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
@@ -5586,7 +5586,7 @@ 
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' hash='878a7be8e06969cb#2' id='type-id-770'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='type-id-770'>
       <parameter type-id='type-id-48'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
diff --git a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
index 4493e031..9939e75e 100644
--- a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
+++ b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
@@ -4305,7 +4305,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='47'>
-        <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEiy' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEiy' hash='6c0034a38e3d69dd#4'>
+        <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEiy' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEiy' hash='6c0034a38e3d69dd'>
           <parameter type-id='type-id-230' is-artificial='yes'/>
           <parameter type-id='type-id-21'/>
           <parameter type-id='type-id-335'/>
@@ -4313,7 +4313,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='48'>
-        <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEix' hash='6c0034a38e3d69dd#4'>
+        <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEix' hash='6c0034a38e3d69dd'>
           <parameter type-id='type-id-230' is-artificial='yes'/>
           <parameter type-id='type-id-21'/>
           <parameter type-id='type-id-332'/>
@@ -4796,13 +4796,13 @@ 
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type method-class-id='type-id-616' size-in-bits='64' hash='6c0034a38e3d69dd#4' id='type-id-708'>
+    <function-type method-class-id='type-id-616' size-in-bits='64' hash='6c0034a38e3d69dd' id='type-id-708'>
       <parameter type-id='type-id-230' is-artificial='yes'/>
       <parameter type-id='type-id-21'/>
       <parameter type-id='type-id-332'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type method-class-id='type-id-616' size-in-bits='64' hash='6c0034a38e3d69dd#4' id='type-id-709'>
+    <function-type method-class-id='type-id-616' size-in-bits='64' hash='6c0034a38e3d69dd' id='type-id-709'>
       <parameter type-id='type-id-230' is-artificial='yes'/>
       <parameter type-id='type-id-21'/>
       <parameter type-id='type-id-335'/>
@@ -7194,7 +7194,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <function-decl name='BindInt64Parameter' mangled-name='_ZN14vtkSQLiteQuery18BindInt64ParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='668' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery18BindInt64ParameterEix' hash='6c0034a38e3d69dd#4'>
+        <function-decl name='BindInt64Parameter' mangled-name='_ZN14vtkSQLiteQuery18BindInt64ParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='668' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery18BindInt64ParameterEix' hash='6c0034a38e3d69dd'>
           <parameter type-id='type-id-1346' is-artificial='yes'/>
           <parameter type-id='type-id-21'/>
           <parameter type-id='type-id-332'/>
@@ -7396,7 +7396,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='47'>
-        <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEiy' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='583' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEiy' hash='6c0034a38e3d69dd#4'>
+        <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEiy' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='583' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEiy' hash='6c0034a38e3d69dd'>
           <parameter type-id='type-id-1346' is-artificial='yes'/>
           <parameter type-id='type-id-21'/>
           <parameter type-id='type-id-335'/>
@@ -7404,7 +7404,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='48'>
-        <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEix' hash='6c0034a38e3d69dd#4'>
+        <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEix' hash='6c0034a38e3d69dd'>
           <parameter type-id='type-id-1346' is-artificial='yes'/>
           <parameter type-id='type-id-21'/>
           <parameter type-id='type-id-332'/>
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index 18f8a6b7..d028d6cb 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -571,6 +571,11 @@ 
                                                                                               7 data member changes:
                                                                                                 type of 'void (* pixel_converter)(uint8_t*, uint8_t*)' changed:
                                                                                                   in pointed to type 'function type void (uint8_t*, uint8_t*)':
+                                                                                                    parameter 1 of type 'uint8_t*' changed:
+                                                                                                      in pointed to type 'typedef uint8_t':
+                                                                                                        entity changed from 'typedef uint8_t' to compatible type 'void'
+                                                                                                          type name changed from 'unsigned char' to 'void'
+                                                                                                          type size changed from 8 to 0 (in bits)
                                                                                                 'MJpegEncoderRateControl rate_control' offset changed from 5824 to 5760 (in bits) (by -64 bits)
                                                                                                 'MJpegEncoderRateControlCbs cbs' offset changed from 7680 to 7616 (in bits) (by -64 bits)
                                                                                                 'void* cbs_opaque' offset changed from 7872 to 7808 (in bits) (by -64 bits)
diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
index 2a8abbb7..dbd1e87c 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -1377,7 +1377,7 @@ 
             </function-decl>
           </member-function>
           <member-function access='public' const='yes'>
-            <function-decl name='data' mangled-name='_ZNK5boost9iostreams18mapped_file_source4dataEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source4dataEv' hash='8d6dd888776a11fb#2'>
+            <function-decl name='data' mangled-name='_ZNK5boost9iostreams18mapped_file_source4dataEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source4dataEv' hash='8d6dd888776a11fb'>
               <parameter type-id='type-id-173' is-artificial='yes'/>
               <return type-id='type-id-31'/>
             </function-decl>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 2cd5ead5..387bbd82 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -1974,14 +1974,14 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <function-decl name='setMaxDirectorySizeBytes' mangled-name='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm' filepath='src/mongo/db/ftdc/controller.cpp' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm' hash='8d6dd888776a11fb#2'>
+          <function-decl name='setMaxDirectorySizeBytes' mangled-name='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm' filepath='src/mongo/db/ftdc/controller.cpp' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm' hash='8d6dd888776a11fb'>
             <parameter type-id='type-id-833' is-artificial='yes'/>
             <parameter type-id='type-id-441' filepath='src/mongo/db/ftdc/controller.cpp' line='71' column='1'/>
             <return type-id='type-id-192'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <function-decl name='setMaxFileSizeBytes' mangled-name='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm' filepath='src/mongo/db/ftdc/controller.cpp' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm' hash='8d6dd888776a11fb#2'>
+          <function-decl name='setMaxFileSizeBytes' mangled-name='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm' filepath='src/mongo/db/ftdc/controller.cpp' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm' hash='8d6dd888776a11fb'>
             <parameter type-id='type-id-833' is-artificial='yes'/>
             <parameter type-id='type-id-441' filepath='src/mongo/db/ftdc/controller.cpp' line='71' column='1'/>
             <return type-id='type-id-192'/>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index b13611f1..7b6be7ad 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -9489,7 +9489,7 @@ 
     <pointer-type-def type-id='type-id-326' size-in-bits='64' hash='30b31f799c91d934' id='type-id-1298'/>
     <pointer-type-def type-id='type-id-567' size-in-bits='64' hash='57e7b04a432f4ec0' id='type-id-557'/>
     <pointer-type-def type-id='type-id-573' size-in-bits='64' hash='86a65d8ad20bf8cd' id='type-id-1299'/>
-    <pointer-type-def type-id='type-id-1300' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-1300' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-432'/>
     <pointer-type-def type-id='type-id-214' size-in-bits='64' hash='4effede5159bb3fa' id='type-id-1301'/>
     <pointer-type-def type-id='type-id-1302' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-581'/>
     <pointer-type-def type-id='type-id-578' size-in-bits='64' hash='86ca62974c4f08ec' id='type-id-1303'/>
@@ -9503,7 +9503,7 @@ 
     <pointer-type-def type-id='type-id-1305' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-392'/>
     <pointer-type-def type-id='type-id-1306' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-370'/>
     <pointer-type-def type-id='type-id-308' size-in-bits='64' hash='f10c377cf00c05d' id='type-id-1307'/>
-    <pointer-type-def type-id='type-id-1308' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-389'/>
+    <pointer-type-def type-id='type-id-1308' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-389'/>
     <pointer-type-def type-id='type-id-1309' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-376'/>
     <pointer-type-def type-id='type-id-1310' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-794'/>
     <pointer-type-def type-id='type-id-1311' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-893'/>
@@ -9593,7 +9593,7 @@ 
     <pointer-type-def type-id='type-id-444' size-in-bits='64' hash='d87bf7bdc54f4294' id='type-id-1349'/>
     <pointer-type-def type-id='type-id-1350' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-822'/>
     <pointer-type-def type-id='type-id-178' size-in-bits='64' hash='34c80eafa9dd78a2' id='type-id-1016'/>
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-1351' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-323'/>
     <pointer-type-def type-id='type-id-210' size-in-bits='64' hash='897dcbde114ca92' id='type-id-285'/>
     <pointer-type-def type-id='type-id-1352' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-156'/>
     <pointer-type-def type-id='type-id-1353' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-157'/>
@@ -9661,7 +9661,7 @@ 
     <pointer-type-def type-id='type-id-1409' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-830'/>
     <pointer-type-def type-id='type-id-1410' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-827'/>
     <pointer-type-def type-id='type-id-1411' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-821'/>
-    <pointer-type-def type-id='type-id-1412' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-1412' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-820'/>
     <pointer-type-def type-id='type-id-1413' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-831'/>
     <pointer-type-def type-id='type-id-1414' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-390'/>
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-513'/>
@@ -9670,7 +9670,7 @@ 
     <pointer-type-def type-id='type-id-1418' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-964'/>
     <pointer-type-def type-id='type-id-1419' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-968'/>
     <pointer-type-def type-id='type-id-1048' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-698'/>
-    <pointer-type-def type-id='type-id-1420' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-1420' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-225'/>
     <pointer-type-def type-id='type-id-1421' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-886'/>
     <pointer-type-def type-id='type-id-1422' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-885'/>
     <pointer-type-def type-id='type-id-1423' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-1072'/>
@@ -9682,7 +9682,7 @@ 
     <pointer-type-def type-id='type-id-1429' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-512'/>
     <pointer-type-def type-id='type-id-1430' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-549'/>
     <pointer-type-def type-id='type-id-1431' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-397'/>
-    <pointer-type-def type-id='type-id-1432' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-884'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-884'/>
     <pointer-type-def type-id='type-id-124' size-in-bits='64' hash='22f365c0257fa483' id='type-id-1433'/>
     <qualified-type-def type-id='type-id-85' volatile='yes' hash='27bf2d2ba6a1db26' id='type-id-901'/>
     <pointer-type-def type-id='type-id-204' size-in-bits='64' hash='6a022a26d375a5c6' id='type-id-1078'/>
@@ -9942,7 +9942,7 @@ 
       <parameter type-id='type-id-444' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
       <return type-id='type-id-1554'/>
     </function-decl>
-    <function-decl name='sdhci_set_clock' mangled-name='sdhci_set_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_clock' hash='648097d4f5419b81#3'>
+    <function-decl name='sdhci_set_clock' mangled-name='sdhci_set_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_clock' hash='648097d4f5419b81'>
       <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1554'/>
@@ -9969,7 +9969,7 @@ 
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-1554'/>
     </function-decl>
-    <function-decl name='sdhci_set_uhs_signaling' mangled-name='sdhci_set_uhs_signaling' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_uhs_signaling' hash='648097d4f5419b81#3'>
+    <function-decl name='sdhci_set_uhs_signaling' mangled-name='sdhci_set_uhs_signaling' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_uhs_signaling' hash='648097d4f5419b81'>
       <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1554'/>
@@ -10001,7 +10001,7 @@ 
       <parameter type-id='type-id-1324'/>
       <return type-id='type-id-1554'/>
     </function-decl>
-    <function-decl name='sdhci_send_tuning' mangled-name='sdhci_send_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_tuning' hash='648097d4f5419b81#2'>
+    <function-decl name='sdhci_send_tuning' mangled-name='sdhci_send_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_tuning' hash='648097d4f5419b81'>
       <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-1554'/>
@@ -10877,7 +10877,7 @@ 
     <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='type-id-1292'>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' hash='8d6dd888776a11fb#2' id='type-id-1300'>
+    <function-type size-in-bits='64' hash='8d6dd888776a11fb' id='type-id-1300'>
       <return type-id='type-id-425'/>
     </function-type>
     <function-type size-in-bits='64' hash='9928bc4a4dcb91fd' id='type-id-1302'>
@@ -10899,7 +10899,7 @@ 
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-308'/>
     </function-type>
-    <function-type size-in-bits='64' hash='26ad9d577ddde803#2' id='type-id-1308'>
+    <function-type size-in-bits='64' hash='26ad9d577ddde803' id='type-id-1308'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-308'/>
@@ -11066,7 +11066,7 @@ 
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-178'/>
     </function-type>
-    <function-type size-in-bits='64' hash='659ced78215eae4a#2' id='type-id-1351'>
+    <function-type size-in-bits='64' hash='659ced78215eae4a' id='type-id-1351'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-210'/>
     </function-type>
@@ -11356,7 +11356,7 @@ 
       <parameter type-id='type-id-643'/>
       <return type-id='type-id-1554'/>
     </function-type>
-    <function-type size-in-bits='64' hash='648097d4f5419b81#2' id='type-id-1409'>
+    <function-type size-in-bits='64' hash='648097d4f5419b81' id='type-id-1409'>
       <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-1554'/>
@@ -11372,7 +11372,7 @@ 
       <parameter type-id='type-id-180'/>
       <return type-id='type-id-1554'/>
     </function-type>
-    <function-type size-in-bits='64' hash='648097d4f5419b81#3' id='type-id-1412'>
+    <function-type size-in-bits='64' hash='648097d4f5419b81' id='type-id-1412'>
       <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1554'/>
@@ -11416,7 +11416,7 @@ 
     <function-type size-in-bits='64' hash='61477c4d1fd8d94d' id='type-id-1048'>
       <return type-id='type-id-1554'/>
     </function-type>
-    <function-type size-in-bits='64' hash='61477c4d1fd8d94d#2' id='type-id-1420'>
+    <function-type size-in-bits='64' hash='61477c4d1fd8d94d' id='type-id-1420'>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-1554'/>
     </function-type>
@@ -11473,7 +11473,7 @@ 
     <function-type size-in-bits='64' hash='61477c4d1fd8d94d' id='type-id-1431'>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' hash='61477c4d1fd8d94d#2' id='type-id-1432'>
+    <function-type size-in-bits='64' hash='61477c4d1fd8d94d' id='type-id-1432'>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-124'/>
     </function-type>
diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
index b9f9eb70..067b67cf 100644
--- a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
+++ b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
@@ -148,7 +148,7 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='falloc.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-    <function-decl name='_gdbm_alloc' mangled-name='_gdbm_alloc' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_alloc' hash='8e5476671143c713#3'>
+    <function-decl name='_gdbm_alloc' mangled-name='_gdbm_alloc' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_alloc' hash='8e5476671143c713'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='52' column='1'/>
       <parameter type-id='type-id-8' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='52' column='1'/>
       <return type-id='type-id-12'/>
@@ -200,7 +200,7 @@ 
       <parameter type-id='type-id-6' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='25' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_gdbm_file_extend' mangled-name='_gdbm_file_extend' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_file_extend' hash='c50376f19f645d5#2'>
+    <function-decl name='_gdbm_file_extend' mangled-name='_gdbm_file_extend' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_file_extend' hash='c50376f19f645d5'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='82' column='1'/>
       <parameter type-id='type-id-12' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='82' column='1'/>
       <return type-id='type-id-8'/>
@@ -480,7 +480,7 @@ 
     <pointer-type-def type-id='type-id-51' size-in-bits='64' hash='3119cafd473d1d82' id='type-id-10'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' hash='a313a584d8561781' id='type-id-50'/>
     <pointer-type-def type-id='type-id-58' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-48'/>
-    <function-decl name='gdbm_close' mangled-name='gdbm_close' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_close' hash='41b53655394fed34#2'>
+    <function-decl name='gdbm_close' mangled-name='gdbm_close' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_close' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -670,11 +670,11 @@ 
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmerrno.c' line='57' column='1'/>
       <return type-id='type-id-47'/>
     </function-decl>
-    <function-decl name='gdbm_last_syserr' mangled-name='gdbm_last_syserr' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmerrno.c' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_last_syserr' hash='41b53655394fed34#2'>
+    <function-decl name='gdbm_last_syserr' mangled-name='gdbm_last_syserr' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmerrno.c' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_last_syserr' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='gdbm_needs_recovery' mangled-name='gdbm_needs_recovery' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmerrno.c' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_needs_recovery' hash='41b53655394fed34#2'>
+    <function-decl name='gdbm_needs_recovery' mangled-name='gdbm_needs_recovery' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmerrno.c' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_needs_recovery' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -719,7 +719,7 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gdbmfdesc.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-    <function-decl name='gdbm_fdesc' mangled-name='gdbm_fdesc' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmfdesc.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_fdesc' hash='41b53655394fed34#2'>
+    <function-decl name='gdbm_fdesc' mangled-name='gdbm_fdesc' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmfdesc.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_fdesc' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -861,7 +861,7 @@ 
       <parameter type-id='type-id-10' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmopen.c' line='122' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_gdbm_validate_header' mangled-name='_gdbm_validate_header' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmopen.c' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_validate_header' hash='41b53655394fed34#2'>
+    <function-decl name='_gdbm_validate_header' mangled-name='_gdbm_validate_header' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmopen.c' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_validate_header' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -893,7 +893,7 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gdbmreorg.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-    <function-decl name='gdbm_reorganize' mangled-name='gdbm_reorganize' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmreorg.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_reorganize' hash='41b53655394fed34#2'>
+    <function-decl name='gdbm_reorganize' mangled-name='gdbm_reorganize' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmreorg.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_reorganize' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -928,7 +928,7 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gdbmsync.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-    <function-decl name='gdbm_sync' mangled-name='gdbm_sync' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmsync.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_sync' hash='41b53655394fed34#2'>
+    <function-decl name='gdbm_sync' mangled-name='gdbm_sync' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmsync.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_sync' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -957,7 +957,7 @@ 
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmerrno.c' line='88' column='1'/>
       <return type-id='type-id-11'/>
     </function-decl>
-    <function-decl name='_gdbm_lock_file' mangled-name='_gdbm_lock_file' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/lock.c' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_lock_file' hash='41b53655394fed34#2'>
+    <function-decl name='_gdbm_lock_file' mangled-name='_gdbm_lock_file' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/lock.c' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_lock_file' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -985,29 +985,29 @@ 
       <parameter type-id='type-id-8' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='100' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_gdbm_mapped_init' mangled-name='_gdbm_mapped_init' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_init' hash='41b53655394fed34#2'>
+    <function-decl name='_gdbm_mapped_init' mangled-name='_gdbm_mapped_init' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_init' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_gdbm_mapped_read' mangled-name='_gdbm_mapped_read' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_read' hash='4e076abb07cc8f73#2'>
+    <function-decl name='_gdbm_mapped_read' mangled-name='_gdbm_mapped_read' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_read' hash='4e076abb07cc8f73'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1'/>
       <parameter type-id='type-id-20' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1'/>
       <parameter type-id='type-id-6' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1'/>
       <return type-id='type-id-96'/>
     </function-decl>
-    <function-decl name='_gdbm_mapped_write' mangled-name='_gdbm_mapped_write' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_write' hash='4e076abb07cc8f73#2'>
+    <function-decl name='_gdbm_mapped_write' mangled-name='_gdbm_mapped_write' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_write' hash='4e076abb07cc8f73'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1'/>
       <parameter type-id='type-id-20' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1'/>
       <parameter type-id='type-id-6' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='235' column='1'/>
       <return type-id='type-id-96'/>
     </function-decl>
-    <function-decl name='_gdbm_mapped_lseek' mangled-name='_gdbm_mapped_lseek' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_lseek' hash='530ff15a20e9eac8#2'>
+    <function-decl name='_gdbm_mapped_lseek' mangled-name='_gdbm_mapped_lseek' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_lseek' hash='530ff15a20e9eac8'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='346' column='1'/>
       <parameter type-id='type-id-12' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='346' column='1'/>
       <parameter type-id='type-id-8' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='346' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='_gdbm_mapped_sync' mangled-name='_gdbm_mapped_sync' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_sync' hash='41b53655394fed34#2'>
+    <function-decl name='_gdbm_mapped_sync' mangled-name='_gdbm_mapped_sync' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_mapped_sync' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -1076,7 +1076,7 @@ 
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='update.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-    <function-decl name='_gdbm_end_update' mangled-name='_gdbm_end_update' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/update.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_end_update' hash='41b53655394fed34#2'>
+    <function-decl name='_gdbm_end_update' mangled-name='_gdbm_end_update' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/update.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_end_update' hash='41b53655394fed34'>
       <parameter type-id='type-id-9' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmclose.c' line='30' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/test-read-dwarf/test-libaaudio.so.abi
index 2e815cb7..50f9f251 100644
--- a/tests/data/test-read-dwarf/test-libaaudio.so.abi
+++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi
@@ -237,8 +237,8 @@ 
         <var-decl name='tm_zone' type-id='80f4b756' visibility='default' filepath='bionic/libc/include/time.h' line='57' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='AAudioStream_dataCallback' type-id='824043e8' size-in-bits='64' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' hash='61477c4d1fd8d94d' id='edb6186f'/>
-    <typedef-decl name='AAudioStream_errorCallback' type-id='00238b2f' size-in-bits='64' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='966' column='1' hash='61477c4d1fd8d94d' id='2e91990d'/>
+    <typedef-decl name='AAudioStream_dataCallback' type-id='40a93d56' size-in-bits='64' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' hash='61477c4d1fd8d94d' id='edb6186f'/>
+    <typedef-decl name='AAudioStream_errorCallback' type-id='86b497aa' size-in-bits='64' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='966' column='1' hash='61477c4d1fd8d94d' id='2e91990d'/>
     <typedef-decl name='__builtin_va_list' type-id='30357e0a' size-in-bits='256' hash='e522f81d7f609007' id='7f896fb4'/>
     <typedef-decl name='__clockid_t' type-id='7eb128d4' size-in-bits='32' filepath='bionic/libc/include/sys/types.h' line='56' column='1' hash='f0c050c6f9f8032e' id='08f9a87a'/>
     <typedef-decl name='__int32_t' type-id='95e97e5e' size-in-bits='32' filepath='bionic/libc/include/stdint.h' line='40' column='1' hash='f0c050c6f9f8032e' id='33f57a65'/>
@@ -287,7 +287,7 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' hash='e7c5efcec748ba6c' id='f0981eec'/>
     <type-decl name='unsigned long long int' size-in-bits='64' hash='d226d906a470de76#2' id='f0981eed'/>
     <type-decl name='wchar_t' size-in-bits='32' hash='e03601bc1680ce34' id='c523b9f1'/>
-    <pointer-type-def type-id='4ea6ed15' size-in-bits='64' hash='c66cdd9c5848f363' id='824043e8'/>
+    <pointer-type-def type-id='39628053' size-in-bits='64' hash='c66cdd9c5848f363' id='40a93d56'/>
     <pointer-type-def type-id='2e552d01' size-in-bits='64' hash='333de72b3edcae6e' id='6de3cf18'/>
     <reference-type-def kind='lvalue' type-id='f74dc428' size-in-bits='64' hash='21e2917c7211d01a' id='bb997e32'/>
     <reference-type-def kind='rvalue' type-id='f74dc428' size-in-bits='64' hash='f15dc248e82aa20e' id='66a1797c'/>
@@ -326,7 +326,7 @@ 
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='64' hash='e34b775ca165913b' id='a68021ce'/>
     <pointer-type-def type-id='c9d12d66' size-in-bits='64' hash='1b2e61475a12089e' id='b2eb2c3f'/>
     <pointer-type-def type-id='dddf6ca2' size-in-bits='64' hash='3f4173ba76a5f2ad' id='d915a820'/>
-    <pointer-type-def type-id='513cf94a' size-in-bits='64' hash='c66cdd9c5848f363' id='00238b2f'/>
+    <pointer-type-def type-id='340319e3' size-in-bits='64' hash='c66cdd9c5848f363' id='86b497aa'/>
     <pointer-type-def type-id='30a82da4' size-in-bits='64' hash='c66cdd9c5848f363' id='c640490b'/>
     <pointer-type-def type-id='c523b9f1' size-in-bits='64' hash='2338850b8cb7ce35' id='323d93c1'/>
     <pointer-type-def type-id='323d93c1' size-in-bits='64' hash='e9272a368a48a792' id='01efdaf1'/>
@@ -352,18 +352,18 @@ 
         </member-type>
       </class-decl>
       <class-decl name='AudioStreamBuilder' visibility='default' is-declaration-only='yes' id='c1fdb0b3'/>
-      <function-decl name='AudioGlobal_getMMapPolicy' mangled-name='_ZN6aaudio25AudioGlobal_getMMapPolicyEv' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#3'>
+      <function-decl name='AudioGlobal_getMMapPolicy' mangled-name='_ZN6aaudio25AudioGlobal_getMMapPolicyEv' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='AudioGlobal_setMMapPolicy' mangled-name='_ZN6aaudio25AudioGlobal_setMMapPolicyEi' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb#2'>
+      <function-decl name='AudioGlobal_setMMapPolicy' mangled-name='_ZN6aaudio25AudioGlobal_setMMapPolicyEi' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb'>
         <parameter type-id='95e97e5e'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='AudioGlobal_convertResultToText' mangled-name='_ZN6aaudio31AudioGlobal_convertResultToTextEi' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='31' column='1' visibility='default' binding='global' size-in-bits='64' hash='648097d4f5419b81#3'>
+      <function-decl name='AudioGlobal_convertResultToText' mangled-name='_ZN6aaudio31AudioGlobal_convertResultToTextEi' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='31' column='1' visibility='default' binding='global' size-in-bits='64' hash='648097d4f5419b81'>
         <parameter type-id='95e97e5e'/>
         <return type-id='80f4b756'/>
       </function-decl>
-      <function-decl name='AudioGlobal_convertStreamStateToText' mangled-name='_ZN6aaudio36AudioGlobal_convertStreamStateToTextEi' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64' hash='648097d4f5419b81#3'>
+      <function-decl name='AudioGlobal_convertStreamStateToText' mangled-name='_ZN6aaudio36AudioGlobal_convertStreamStateToTextEi' filepath='frameworks/av/media/libaaudio/src/core/AudioGlobal.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64' hash='648097d4f5419b81'>
         <parameter type-id='95e97e5e'/>
         <return type-id='80f4b756'/>
       </function-decl>
@@ -416,7 +416,7 @@ 
       <parameter type-id='da775bc6' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='48' column='1'/>
       <return type-id='80f4b756'/>
     </function-decl>
-    <function-decl name='AAudio_convertStreamStateToText' mangled-name='AAudio_convertStreamStateToText' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudio_convertStreamStateToText@@LIBAAUDIO' hash='648097d4f5419b81#2'>
+    <function-decl name='AAudio_convertStreamStateToText' mangled-name='AAudio_convertStreamStateToText' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudio_convertStreamStateToText@@LIBAAUDIO' hash='648097d4f5419b81'>
       <parameter type-id='2e552d01' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='52' column='1'/>
       <return type-id='80f4b756'/>
     </function-decl>
@@ -424,57 +424,57 @@ 
       <parameter type-id='2126fba9' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='66' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setPerformanceMode' mangled-name='AAudioStreamBuilder_setPerformanceMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setPerformanceMode@@LIBAAUDIO' hash='d97f95fe79cacdf1#6'>
+    <function-decl name='AAudioStreamBuilder_setPerformanceMode' mangled-name='AAudioStreamBuilder_setPerformanceMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setPerformanceMode@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='76' column='1'/>
       <parameter type-id='6757629b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='77' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setDeviceId' mangled-name='AAudioStreamBuilder_setDeviceId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setDeviceId@@LIBAAUDIO' hash='d97f95fe79cacdf1#10'>
+    <function-decl name='AAudioStreamBuilder_setDeviceId' mangled-name='AAudioStreamBuilder_setDeviceId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setDeviceId@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='84' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setSampleRate' mangled-name='AAudioStreamBuilder_setSampleRate' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSampleRate@@LIBAAUDIO' hash='d97f95fe79cacdf1#10'>
+    <function-decl name='AAudioStreamBuilder_setSampleRate' mangled-name='AAudioStreamBuilder_setSampleRate' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSampleRate@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='84' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setChannelCount' mangled-name='AAudioStreamBuilder_setChannelCount' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setChannelCount@@LIBAAUDIO' hash='d97f95fe79cacdf1#10'>
+    <function-decl name='AAudioStreamBuilder_setChannelCount' mangled-name='AAudioStreamBuilder_setChannelCount' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setChannelCount@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='84' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setSamplesPerFrame' mangled-name='AAudioStreamBuilder_setSamplesPerFrame' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSamplesPerFrame@@LIBAAUDIO' hash='d97f95fe79cacdf1#10'>
+    <function-decl name='AAudioStreamBuilder_setSamplesPerFrame' mangled-name='AAudioStreamBuilder_setSamplesPerFrame' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSamplesPerFrame@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='84' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setDirection' mangled-name='AAudioStreamBuilder_setDirection' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setDirection@@LIBAAUDIO' hash='d97f95fe79cacdf1#3'>
+    <function-decl name='AAudioStreamBuilder_setDirection' mangled-name='AAudioStreamBuilder_setDirection' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setDirection@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='110' column='1'/>
       <parameter type-id='a5156fbe' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='111' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setFormat' mangled-name='AAudioStreamBuilder_setFormat' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setFormat@@LIBAAUDIO' hash='d97f95fe79cacdf1#4'>
+    <function-decl name='AAudioStreamBuilder_setFormat' mangled-name='AAudioStreamBuilder_setFormat' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setFormat@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='117' column='1'/>
       <parameter type-id='f21c6374' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='118' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setSharingMode' mangled-name='AAudioStreamBuilder_setSharingMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSharingMode@@LIBAAUDIO' hash='d97f95fe79cacdf1#8'>
+    <function-decl name='AAudioStreamBuilder_setSharingMode' mangled-name='AAudioStreamBuilder_setSharingMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSharingMode@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='126' column='1'/>
       <parameter type-id='da67c8b9' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='127' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setUsage' mangled-name='AAudioStreamBuilder_setUsage' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setUsage@@LIBAAUDIO' hash='d97f95fe79cacdf1#9'>
+    <function-decl name='AAudioStreamBuilder_setUsage' mangled-name='AAudioStreamBuilder_setUsage' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setUsage@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='133' column='1'/>
       <parameter type-id='8ee4dca8' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='134' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setContentType' mangled-name='AAudioStreamBuilder_setContentType' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setContentType@@LIBAAUDIO' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='AAudioStreamBuilder_setContentType' mangled-name='AAudioStreamBuilder_setContentType' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setContentType@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='139' column='1'/>
       <parameter type-id='2df7abd1' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='140' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setInputPreset' mangled-name='AAudioStreamBuilder_setInputPreset' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setInputPreset@@LIBAAUDIO' hash='d97f95fe79cacdf1#5'>
+    <function-decl name='AAudioStreamBuilder_setInputPreset' mangled-name='AAudioStreamBuilder_setInputPreset' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setInputPreset@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='145' column='1'/>
       <parameter type-id='a4168325' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='146' column='1'/>
       <return type-id='48b5725f'/>
@@ -484,7 +484,7 @@ 
       <parameter type-id='c894953d' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='152' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setBufferCapacityInFrames' mangled-name='AAudioStreamBuilder_setBufferCapacityInFrames' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setBufferCapacityInFrames@@LIBAAUDIO' hash='d97f95fe79cacdf1#10'>
+    <function-decl name='AAudioStreamBuilder_setBufferCapacityInFrames' mangled-name='AAudioStreamBuilder_setBufferCapacityInFrames' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setBufferCapacityInFrames@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='84' column='1'/>
       <return type-id='48b5725f'/>
@@ -494,7 +494,7 @@ 
       <parameter type-id='abe3e34b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='165' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setSessionId' mangled-name='AAudioStreamBuilder_setSessionId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSessionId@@LIBAAUDIO' hash='d97f95fe79cacdf1#7'>
+    <function-decl name='AAudioStreamBuilder_setSessionId' mangled-name='AAudioStreamBuilder_setSessionId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setSessionId@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='170' column='1'/>
       <parameter type-id='4d6761d3' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='171' column='1'/>
       <return type-id='48b5725f'/>
@@ -511,7 +511,7 @@ 
       <parameter type-id='eaa32e2f' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='188' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AAudioStreamBuilder_setFramesPerDataCallback' mangled-name='AAudioStreamBuilder_setFramesPerDataCallback' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setFramesPerDataCallback@@LIBAAUDIO' hash='d97f95fe79cacdf1#10'>
+    <function-decl name='AAudioStreamBuilder_setFramesPerDataCallback' mangled-name='AAudioStreamBuilder_setFramesPerDataCallback' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStreamBuilder_setFramesPerDataCallback@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='83' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='84' column='1'/>
       <return type-id='48b5725f'/>
@@ -525,27 +525,27 @@ 
       <parameter type-id='c56f4379' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='223' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_release' mangled-name='AAudioStream_release' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_release@@LIBAAUDIO' hash='d97f95fe79cacdf1#7'>
+    <function-decl name='AAudioStream_release' mangled-name='AAudioStream_release' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_release@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_close' mangled-name='AAudioStream_close' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_close@@LIBAAUDIO' hash='d97f95fe79cacdf1#7'>
+    <function-decl name='AAudioStream_close' mangled-name='AAudioStream_close' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_close@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_requestStart' mangled-name='AAudioStream_requestStart' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestStart@@LIBAAUDIO' hash='d97f95fe79cacdf1#7'>
+    <function-decl name='AAudioStream_requestStart' mangled-name='AAudioStream_requestStart' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestStart@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_requestPause' mangled-name='AAudioStream_requestPause' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestPause@@LIBAAUDIO' hash='d97f95fe79cacdf1#7'>
+    <function-decl name='AAudioStream_requestPause' mangled-name='AAudioStream_requestPause' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestPause@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_requestFlush' mangled-name='AAudioStream_requestFlush' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='291' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestFlush@@LIBAAUDIO' hash='d97f95fe79cacdf1#7'>
+    <function-decl name='AAudioStream_requestFlush' mangled-name='AAudioStream_requestFlush' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='291' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestFlush@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_requestStop' mangled-name='AAudioStream_requestStop' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestStop@@LIBAAUDIO' hash='d97f95fe79cacdf1#7'>
+    <function-decl name='AAudioStream_requestStop' mangled-name='AAudioStream_requestStop' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_requestStop@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='233' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
@@ -570,23 +570,23 @@ 
       <parameter type-id='9da381c4' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='322' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_getSampleRate' mangled-name='AAudioStream_getSampleRate' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSampleRate@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getSampleRate' mangled-name='AAudioStream_getSampleRate' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSampleRate@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getChannelCount' mangled-name='AAudioStream_getChannelCount' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getChannelCount@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getChannelCount' mangled-name='AAudioStream_getChannelCount' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getChannelCount@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getSamplesPerFrame' mangled-name='AAudioStream_getSamplesPerFrame' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSamplesPerFrame@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getSamplesPerFrame' mangled-name='AAudioStream_getSamplesPerFrame' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSamplesPerFrame@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getState' mangled-name='AAudioStream_getState' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getState@@LIBAAUDIO' hash='d97f95fe79cacdf1#9'>
+    <function-decl name='AAudioStream_getState' mangled-name='AAudioStream_getState' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getState@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='387' column='1'/>
       <return type-id='2e552d01'/>
     </function-decl>
-    <function-decl name='AAudioStream_getFormat' mangled-name='AAudioStream_getFormat' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFormat@@LIBAAUDIO' hash='d97f95fe79cacdf1#4'>
+    <function-decl name='AAudioStream_getFormat' mangled-name='AAudioStream_getFormat' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFormat@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='393' column='1'/>
       <return type-id='f21c6374'/>
     </function-decl>
@@ -595,51 +595,51 @@ 
       <parameter type-id='3ff5601b' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='402' column='1'/>
       <return type-id='da775bc6'/>
     </function-decl>
-    <function-decl name='AAudioStream_getBufferSizeInFrames' mangled-name='AAudioStream_getBufferSizeInFrames' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getBufferSizeInFrames@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getBufferSizeInFrames' mangled-name='AAudioStream_getBufferSizeInFrames' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getBufferSizeInFrames@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getDirection' mangled-name='AAudioStream_getDirection' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getDirection@@LIBAAUDIO' hash='d97f95fe79cacdf1#3'>
+    <function-decl name='AAudioStream_getDirection' mangled-name='AAudioStream_getDirection' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getDirection@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='414' column='1'/>
       <return type-id='a5156fbe'/>
     </function-decl>
-    <function-decl name='AAudioStream_getFramesPerBurst' mangled-name='AAudioStream_getFramesPerBurst' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='420' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesPerBurst@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getFramesPerBurst' mangled-name='AAudioStream_getFramesPerBurst' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='420' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesPerBurst@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getFramesPerDataCallback' mangled-name='AAudioStream_getFramesPerDataCallback' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='426' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesPerDataCallback@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getFramesPerDataCallback' mangled-name='AAudioStream_getFramesPerDataCallback' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='426' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesPerDataCallback@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getBufferCapacityInFrames' mangled-name='AAudioStream_getBufferCapacityInFrames' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getBufferCapacityInFrames@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getBufferCapacityInFrames' mangled-name='AAudioStream_getBufferCapacityInFrames' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getBufferCapacityInFrames@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getXRunCount' mangled-name='AAudioStream_getXRunCount' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getXRunCount@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getXRunCount' mangled-name='AAudioStream_getXRunCount' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getXRunCount@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getPerformanceMode' mangled-name='AAudioStream_getPerformanceMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getPerformanceMode@@LIBAAUDIO' hash='d97f95fe79cacdf1#6'>
+    <function-decl name='AAudioStream_getPerformanceMode' mangled-name='AAudioStream_getPerformanceMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getPerformanceMode@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='444' column='1'/>
       <return type-id='6757629b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getDeviceId' mangled-name='AAudioStream_getDeviceId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getDeviceId@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getDeviceId' mangled-name='AAudioStream_getDeviceId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getDeviceId@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getSharingMode' mangled-name='AAudioStream_getSharingMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSharingMode@@LIBAAUDIO' hash='d97f95fe79cacdf1#8'>
+    <function-decl name='AAudioStream_getSharingMode' mangled-name='AAudioStream_getSharingMode' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSharingMode@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='456' column='1'/>
       <return type-id='da67c8b9'/>
     </function-decl>
-    <function-decl name='AAudioStream_getUsage' mangled-name='AAudioStream_getUsage' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getUsage@@LIBAAUDIO' hash='d97f95fe79cacdf1#10'>
+    <function-decl name='AAudioStream_getUsage' mangled-name='AAudioStream_getUsage' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getUsage@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='462' column='1'/>
       <return type-id='8ee4dca8'/>
     </function-decl>
-    <function-decl name='AAudioStream_getContentType' mangled-name='AAudioStream_getContentType' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getContentType@@LIBAAUDIO' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='AAudioStream_getContentType' mangled-name='AAudioStream_getContentType' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getContentType@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='468' column='1'/>
       <return type-id='2df7abd1'/>
     </function-decl>
-    <function-decl name='AAudioStream_getInputPreset' mangled-name='AAudioStream_getInputPreset' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getInputPreset@@LIBAAUDIO' hash='d97f95fe79cacdf1#5'>
+    <function-decl name='AAudioStream_getInputPreset' mangled-name='AAudioStream_getInputPreset' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getInputPreset@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='474' column='1'/>
       <return type-id='a4168325'/>
     </function-decl>
@@ -647,15 +647,15 @@ 
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='481' column='1'/>
       <return type-id='abe3e34b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getSessionId' mangled-name='AAudioStream_getSessionId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSessionId@@LIBAAUDIO' hash='d97f95fe79cacdf1#11'>
+    <function-decl name='AAudioStream_getSessionId' mangled-name='AAudioStream_getSessionId' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getSessionId@@LIBAAUDIO' hash='d97f95fe79cacdf1'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='370' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AAudioStream_getFramesWritten' mangled-name='AAudioStream_getFramesWritten' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesWritten@@LIBAAUDIO' hash='8d6dd888776a11fb#12'>
+    <function-decl name='AAudioStream_getFramesWritten' mangled-name='AAudioStream_getFramesWritten' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesWritten@@LIBAAUDIO' hash='8d6dd888776a11fb'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='493' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
-    <function-decl name='AAudioStream_getFramesRead' mangled-name='AAudioStream_getFramesRead' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesRead@@LIBAAUDIO' hash='8d6dd888776a11fb#12'>
+    <function-decl name='AAudioStream_getFramesRead' mangled-name='AAudioStream_getFramesRead' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AAudioStream_getFramesRead@@LIBAAUDIO' hash='8d6dd888776a11fb'>
       <parameter type-id='b2a1b704' filepath='frameworks/av/media/libaaudio/src/core/AAudioAudio.cpp' line='493' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
@@ -692,7 +692,7 @@ 
     <type-decl name='variadic parameter type' id='2c1145c5'/>
     <type-decl name='void' id='48b5725f'/>
     <pointer-type-def type-id='48b5725f' id='eaa32e2f'/>
-    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='4ea6ed15'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='39628053'>
       <parameter type-id='b2a1b704'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='eaa32e2f'/>
@@ -704,7 +704,7 @@ 
       <parameter type-id='eaa32e2f'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='513cf94a'>
+    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='340319e3'>
       <parameter type-id='b2a1b704'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='da775bc6'/>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 585513a9..e4503a14 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -1042,7 +1042,7 @@ 
     <function-decl name='abort' filepath='bionic/libc/include/stdlib.h' line='44' column='1' visibility='default' binding='global' size-in-bits='32' hash='f0c050c6f9f8032e'>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='strtol' filepath='bionic/libc/include/stdlib.h' line='75' column='1' visibility='default' binding='global' size-in-bits='32' hash='4e5de69871656b20#2'>
+    <function-decl name='strtol' filepath='bionic/libc/include/stdlib.h' line='75' column='1' visibility='default' binding='global' size-in-bits='32' hash='4e5de69871656b20'>
       <parameter type-id='80f4b756'/>
       <parameter type-id='9b23c9ad'/>
       <parameter type-id='95e97e5e'/>
@@ -1065,12 +1065,12 @@ 
     <function-type size-in-bits='32' hash='f0c050c6f9f8032e' id='30a82da4'>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type method-class-id='65c10d3d' const='yes' size-in-bits='32' hash='369bf6ce5c75f19' id='4cc4f76b'>
+    <function-type method-class-id='65c10d3d' const='yes' size-in-bits='32' hash='369bf6ce5c75f19' id='7800ddc3'>
       <parameter type-id='a5f3e61a' is-artificial='yes'/>
       <parameter type-id='1a1ddb91'/>
       <return type-id='6e9756f6'/>
     </function-type>
-    <function-type method-class-id='65c10d3d' size-in-bits='32' hash='369bf6ce5c75f19' id='79583a0c'>
+    <function-type method-class-id='65c10d3d' size-in-bits='32' hash='369bf6ce5c75f19' id='ec772de4'>
       <parameter type-id='5a61729d' is-artificial='yes'/>
       <parameter type-id='79927164'/>
       <return type-id='6e9756f6'/>
@@ -1098,44 +1098,44 @@ 
       <parameter type-id='32d2f295' is-artificial='yes'/>
       <return type-id='157d4f95'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='369bf6ce5c75f19' id='ab79f659'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='369bf6ce5c75f19' id='8fcdba47'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='125a6717dec0b9d6' id='3b5a5b1e'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='125a6717dec0b9d6' id='9147daf8'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='763d7e1a'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='125a6717dec0b9d6' id='e9c7ea01'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='125a6717dec0b9d6' id='3f99935b'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='157d4f95'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='4e5de69871656b20' id='2777f989'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='4e5de69871656b20' id='dcb51357'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='922df12b'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='7deb416bd728693c' id='6c2662ee'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='7deb416bd728693c' id='acf1e218'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='4ab96a04'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='73d5eb85bb46d109' id='ff8fe339'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='73d5eb85bb46d109' id='c9d3f127'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='4ab96a04'/>
       <parameter type-id='4ab96a04'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='c78ff76cf12d8e44' id='4adb99e9'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='c78ff76cf12d8e44' id='ec037fd7'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='922df12b'/>
@@ -1144,13 +1144,13 @@ 
       <parameter type-id='922df12b'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='bf075117' size-in-bits='32' hash='125a6717dec0b9d6' id='ab944528'>
+    <function-type method-class-id='bf075117' size-in-bits='32' hash='125a6717dec0b9d6' id='a1591e12'>
       <parameter type-id='9cb9149f' is-artificial='yes'/>
       <parameter type-id='157d4f95'/>
       <parameter type-id='9aa04798'/>
       <return type-id='3ff5601b'/>
     </function-type>
-    <function-type method-class-id='c73fabea' const='yes' size-in-bits='32' hash='c8041b3a5ceebe4b' id='10d43f71'>
+    <function-type method-class-id='c73fabea' const='yes' size-in-bits='32' hash='c8041b3a5ceebe4b' id='6fad5765'>
       <parameter type-id='197d55e1' is-artificial='yes'/>
       <return type-id='b59d7dce'/>
     </function-type>
@@ -1726,7 +1726,7 @@ 
     </class-decl>
     <typedef-decl name='wctrans_t' type-id='eaa32e2f' filepath='bionic/libc/include/bits/wctype.h' line='60' column='1' id='183c72c4'/>
     <typedef-decl name='FILE' type-id='8d7b2c1f' filepath='bionic/libc/include/stdio.h' line='59' column='1' id='aa12d1bb'/>
-    <function-type method-class-id='b4c0d64f' size-in-bits='32' hash='b6d18584d7e12ba7' id='995590ca'>
+    <function-type method-class-id='b4c0d64f' size-in-bits='32' hash='b6d18584d7e12ba7' id='5916a086'>
       <parameter type-id='36e31287' is-artificial='yes'/>
       <parameter type-id='8f92235e'/>
       <parameter type-id='6d925e80'/>
@@ -1734,12 +1734,12 @@ 
       <parameter type-id='8f92235e'/>
       <return type-id='6e9756f6'/>
     </function-type>
-    <function-type method-class-id='f8f7e309' const='yes' size-in-bits='32' hash='369bf6ce5c75f19' id='ef9ba467'>
+    <function-type method-class-id='f8f7e309' const='yes' size-in-bits='32' hash='369bf6ce5c75f19' id='a2b8ed4f'>
       <parameter type-id='6a9db9a0' is-artificial='yes'/>
       <parameter type-id='1a1ddb91'/>
       <return type-id='6e9756f6'/>
     </function-type>
-    <function-type method-class-id='f8f7e309' size-in-bits='32' hash='369bf6ce5c75f19' id='05ee5af0'>
+    <function-type method-class-id='f8f7e309' size-in-bits='32' hash='369bf6ce5c75f19' id='1546df38'>
       <parameter type-id='f7891b51' is-artificial='yes'/>
       <parameter type-id='79927164'/>
       <return type-id='6e9756f6'/>
@@ -1984,40 +1984,40 @@ 
         <var-decl name='reserved3' type-id='eaa32e2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='153' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='GetVersion' type-id='f3fd167a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
+        <var-decl name='GetVersion' type-id='7e62d932' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='DefineClass' type-id='30ee23e3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
+        <var-decl name='DefineClass' type-id='93fe72f9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='FindClass' type-id='2b174cab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
+        <var-decl name='FindClass' type-id='0701e7a2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='FromReflectedMethod' type-id='70351828' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
+        <var-decl name='FromReflectedMethod' type-id='302207a0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='FromReflectedField' type-id='6098e447' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
+        <var-decl name='FromReflectedField' type-id='b4201f3f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='ToReflectedMethod' type-id='0e7dc576' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
+        <var-decl name='ToReflectedMethod' type-id='e6deb706' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='GetSuperclass' type-id='a96e9567' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
+        <var-decl name='GetSuperclass' type-id='96a2b59f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='IsAssignableFrom' type-id='f42dbf4e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
+        <var-decl name='IsAssignableFrom' type-id='51a12745' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ToReflectedField' type-id='7bbfad59' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
+        <var-decl name='ToReflectedField' type-id='fcfbd023' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='Throw' type-id='797bd39f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
+        <var-decl name='Throw' type-id='ed039044' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='ThrowNew' type-id='bbfa68cc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
+        <var-decl name='ThrowNew' type-id='66017941' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='ExceptionOccurred' type-id='a8a22fa6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
+        <var-decl name='ExceptionOccurred' type-id='ebe3c60d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='ExceptionDescribe' type-id='e45dd401' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='175' column='1'/>
@@ -2029,646 +2029,646 @@ 
         <var-decl name='FatalError' type-id='7a98879a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='177' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='PushLocalFrame' type-id='e459a6af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
+        <var-decl name='PushLocalFrame' type-id='d48cb67f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='PopLocalFrame' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
+        <var-decl name='PopLocalFrame' type-id='9c119f0f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='NewGlobalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
+        <var-decl name='NewGlobalRef' type-id='9c119f0f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='DeleteGlobalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='183' column='1'/>
+        <var-decl name='DeleteGlobalRef' type-id='dcb938f6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='DeleteLocalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='184' column='1'/>
+        <var-decl name='DeleteLocalRef' type-id='dcb938f6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='184' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='IsSameObject' type-id='d2595e76' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
+        <var-decl name='IsSameObject' type-id='e089ff87' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='NewLocalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
+        <var-decl name='NewLocalRef' type-id='9c119f0f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='EnsureLocalCapacity' type-id='e459a6af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
+        <var-decl name='EnsureLocalCapacity' type-id='d48cb67f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='AllocObject' type-id='2365fdd8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
+        <var-decl name='AllocObject' type-id='73cc2298' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='NewObject' type-id='89b4862b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
+        <var-decl name='NewObject' type-id='d7458144' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='NewObjectV' type-id='c40ae374' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
+        <var-decl name='NewObjectV' type-id='f58e29c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='NewObjectA' type-id='99ff6e15' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
+        <var-decl name='NewObjectA' type-id='e4ddaae2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
-        <var-decl name='GetObjectClass' type-id='15829ccc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
+        <var-decl name='GetObjectClass' type-id='b769f8ce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='IsInstanceOf' type-id='af9b66a1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
+        <var-decl name='IsInstanceOf' type-id='edf75eb0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1056'>
-        <var-decl name='GetMethodID' type-id='e475bf19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
+        <var-decl name='GetMethodID' type-id='84ed917f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='CallObjectMethod' type-id='38711a82' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
+        <var-decl name='CallObjectMethod' type-id='e4dd1d6b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='CallObjectMethodV' type-id='4025b733' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
+        <var-decl name='CallObjectMethodV' type-id='25d63ceb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='CallObjectMethodA' type-id='ff005e88' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
+        <var-decl name='CallObjectMethodA' type-id='2e9f47d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='CallBooleanMethod' type-id='c5017f63' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
+        <var-decl name='CallBooleanMethod' type-id='d45ba39e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='CallBooleanMethodV' type-id='9b7e723c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
+        <var-decl name='CallBooleanMethodV' type-id='e6dd1f9e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='CallBooleanMethodA' type-id='286a904d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
+        <var-decl name='CallBooleanMethodA' type-id='214c5f44' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='CallByteMethod' type-id='a6e4e20e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
+        <var-decl name='CallByteMethod' type-id='d3e60ade' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1312'>
-        <var-decl name='CallByteMethodV' type-id='b73332bf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
+        <var-decl name='CallByteMethodV' type-id='ac58975e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='CallByteMethodA' type-id='7e64ceb4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
+        <var-decl name='CallByteMethodA' type-id='483faa04' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1376'>
-        <var-decl name='CallCharMethod' type-id='abb6ff0a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
+        <var-decl name='CallCharMethod' type-id='4eccfcec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='CallCharMethodV' type-id='3940caeb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
+        <var-decl name='CallCharMethodV' type-id='ebd01c4c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1440'>
-        <var-decl name='CallCharMethodA' type-id='18ca9f30' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
+        <var-decl name='CallCharMethodA' type-id='ae8575aa' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='CallShortMethod' type-id='0f8d5f3b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
+        <var-decl name='CallShortMethod' type-id='3792de44' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='CallShortMethodV' type-id='1c93d4e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
+        <var-decl name='CallShortMethodV' type-id='609456c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='CallShortMethodA' type-id='7b6e1be5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
+        <var-decl name='CallShortMethodA' type-id='e44a6fe2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='CallIntMethod' type-id='0f8d5f3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
+        <var-decl name='CallIntMethod' type-id='10997527' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='CallIntMethodV' type-id='1c93d4e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
+        <var-decl name='CallIntMethodV' type-id='72203d5f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1632'>
-        <var-decl name='CallIntMethodA' type-id='7b6e1be6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
+        <var-decl name='CallIntMethodA' type-id='6efc86e1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='CallLongMethod' type-id='0f8d5f3d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
+        <var-decl name='CallLongMethod' type-id='b9c24b8a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
-        <var-decl name='CallLongMethodV' type-id='1c93d4e6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
+        <var-decl name='CallLongMethodV' type-id='52583992' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='CallLongMethodA' type-id='7b6e1be7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
+        <var-decl name='CallLongMethodA' type-id='571d8fb0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1760'>
-        <var-decl name='CallFloatMethod' type-id='29b6037c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
+        <var-decl name='CallFloatMethod' type-id='09928654' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='CallFloatMethodV' type-id='e91668fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
+        <var-decl name='CallFloatMethodV' type-id='5ee3c214' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1824'>
-        <var-decl name='CallFloatMethodA' type-id='154c703a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
+        <var-decl name='CallFloatMethodA' type-id='9f32ba72' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='CallDoubleMethod' type-id='e06b46ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
+        <var-decl name='CallDoubleMethod' type-id='b76bba71' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1888'>
-        <var-decl name='CallDoubleMethodV' type-id='fd720bfe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
+        <var-decl name='CallDoubleMethodV' type-id='cb41d9c1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='CallDoubleMethodA' type-id='0aafbc07' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
+        <var-decl name='CallDoubleMethodA' type-id='99520b7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1952'>
-        <var-decl name='CallVoidMethod' type-id='4d8d0cb6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='226' column='1'/>
+        <var-decl name='CallVoidMethod' type-id='9dfb2c96' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='CallVoidMethodV' type-id='c0e9d857' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='227' column='1'/>
+        <var-decl name='CallVoidMethodV' type-id='d88d0f96' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='227' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2016'>
-        <var-decl name='CallVoidMethodA' type-id='a1f794fc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='228' column='1'/>
+        <var-decl name='CallVoidMethodA' type-id='46effcdc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='228' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='CallNonvirtualObjectMethod' type-id='87683ec7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethod' type-id='2d40e32d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='CallNonvirtualObjectMethodV' type-id='5debed90' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodV' type-id='3155ce35' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='CallNonvirtualObjectMethodA' type-id='c8123d81' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodA' type-id='3aa77c87' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2144'>
-        <var-decl name='CallNonvirtualBooleanMethod' type-id='70076aa2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethod' type-id='365ad2dc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='CallNonvirtualBooleanMethodV' type-id='f7295393' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodV' type-id='14a5b6bc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2208'>
-        <var-decl name='CallNonvirtualBooleanMethodA' type-id='fdb6d1a8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodA' type-id='03b4d21a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='CallNonvirtualByteMethod' type-id='b90b8f9b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
+        <var-decl name='CallNonvirtualByteMethod' type-id='19f8581c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2272'>
-        <var-decl name='CallNonvirtualByteMethodV' type-id='19e79f04' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodV' type-id='c45ae27c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='CallNonvirtualByteMethodA' type-id='72aad4c5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodA' type-id='95eb11da' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2336'>
-        <var-decl name='CallNonvirtualCharMethod' type-id='3f53351f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
+        <var-decl name='CallNonvirtualCharMethod' type-id='a0a864ea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='CallNonvirtualCharMethodV' type-id='60ba8818' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodV' type-id='e08f90b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2400'>
-        <var-decl name='CallNonvirtualCharMethodA' type-id='de836af9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodA' type-id='3d1c1990' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='CallNonvirtualShortMethod' type-id='bd2b792a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
+        <var-decl name='CallNonvirtualShortMethod' type-id='8243b832' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2464'>
-        <var-decl name='CallNonvirtualShortMethodV' type-id='5f5d06cb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodV' type-id='2e6fa23a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='CallNonvirtualShortMethodA' type-id='51953750' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodA' type-id='6835b638' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2528'>
-        <var-decl name='CallNonvirtualIntMethod' type-id='bd2b792b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
+        <var-decl name='CallNonvirtualIntMethod' type-id='4d7ba689' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='CallNonvirtualIntMethodV' type-id='5f5d06cc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodV' type-id='0d9ebbb9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2592'>
-        <var-decl name='CallNonvirtualIntMethodA' type-id='51953751' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodA' type-id='a594cd33' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='CallNonvirtualLongMethod' type-id='bd2b792c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
+        <var-decl name='CallNonvirtualLongMethod' type-id='a97276f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2656'>
-        <var-decl name='CallNonvirtualLongMethodV' type-id='5f5d06cd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodV' type-id='a5f29b60' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='CallNonvirtualLongMethodA' type-id='51953752' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodA' type-id='d8865276' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2720'>
-        <var-decl name='CallNonvirtualFloatMethod' type-id='bec66371' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethod' type-id='0a890a42' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
-        <var-decl name='CallNonvirtualFloatMethodV' type-id='43ae4cf2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodV' type-id='ff165b8a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2784'>
-        <var-decl name='CallNonvirtualFloatMethodA' type-id='f1447c7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodA' type-id='47e937c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='CallNonvirtualDoubleMethod' type-id='7c6967e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethod' type-id='47bd5aa3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2848'>
-        <var-decl name='CallNonvirtualDoubleMethodV' type-id='06674af5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodV' type-id='bcb23543' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='CallNonvirtualDoubleMethodA' type-id='9aee4982' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodA' type-id='974e7d0d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2912'>
-        <var-decl name='CallNonvirtualVoidMethod' type-id='c003e813' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='284' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethod' type-id='52490c64' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='284' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2944'>
-        <var-decl name='CallNonvirtualVoidMethodV' type-id='3d23490c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='286' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethodV' type-id='02597924' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='286' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2976'>
-        <var-decl name='CallNonvirtualVoidMethodA' type-id='49f4e2fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='288' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethodA' type-id='cb345202' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='288' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3008'>
-        <var-decl name='GetFieldID' type-id='234a6cd4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
+        <var-decl name='GetFieldID' type-id='a316ff5e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3040'>
-        <var-decl name='GetObjectField' type-id='21976f65' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
+        <var-decl name='GetObjectField' type-id='de6ab93a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='GetBooleanField' type-id='8c01ad3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
+        <var-decl name='GetBooleanField' type-id='4a3ee6bf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3104'>
-        <var-decl name='GetByteField' type-id='11c5f5c9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
+        <var-decl name='GetByteField' type-id='5750967f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
-        <var-decl name='GetCharField' type-id='340bfd9d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
+        <var-decl name='GetCharField' type-id='002b51d9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3168'>
-        <var-decl name='GetShortField' type-id='e3d72664' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
+        <var-decl name='GetShortField' type-id='502b46a1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='GetIntField' type-id='e3d72665' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
+        <var-decl name='GetIntField' type-id='5203f86e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3232'>
-        <var-decl name='GetLongField' type-id='e3d72666' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
+        <var-decl name='GetLongField' type-id='8a93d1c3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='GetFloatField' type-id='bae7b123' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
+        <var-decl name='GetFloatField' type-id='9202a511' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3296'>
-        <var-decl name='GetDoubleField' type-id='3d49369a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
+        <var-decl name='GetDoubleField' type-id='cf64aecc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='SetObjectField' type-id='68835375' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='303' column='1'/>
+        <var-decl name='SetObjectField' type-id='93ed7c54' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='303' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3360'>
-        <var-decl name='SetBooleanField' type-id='368860b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='304' column='1'/>
+        <var-decl name='SetBooleanField' type-id='f9ae2915' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='SetByteField' type-id='931a74f1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='305' column='1'/>
+        <var-decl name='SetByteField' type-id='2f2ff64f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='305' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3424'>
-        <var-decl name='SetCharField' type-id='fc76ab83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='306' column='1'/>
+        <var-decl name='SetCharField' type-id='963c2d49' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='SetShortField' type-id='1135eb82' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='307' column='1'/>
+        <var-decl name='SetShortField' type-id='8220f20b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='307' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3488'>
-        <var-decl name='SetIntField' type-id='1135eb83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='308' column='1'/>
+        <var-decl name='SetIntField' type-id='d2bd2fda' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='308' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='SetLongField' type-id='1135eb84' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='309' column='1'/>
+        <var-decl name='SetLongField' type-id='fa4898ab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='SetFloatField' type-id='211caeb7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='310' column='1'/>
+        <var-decl name='SetFloatField' type-id='03105c2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='310' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='SetDoubleField' type-id='0408c00e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='311' column='1'/>
+        <var-decl name='SetDoubleField' type-id='87524436' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3616'>
-        <var-decl name='GetStaticMethodID' type-id='e475bf19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
+        <var-decl name='GetStaticMethodID' type-id='84ed917f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='CallStaticObjectMethod' type-id='89b4862b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
+        <var-decl name='CallStaticObjectMethod' type-id='d7458144' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3680'>
-        <var-decl name='CallStaticObjectMethodV' type-id='c40ae374' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
+        <var-decl name='CallStaticObjectMethodV' type-id='f58e29c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
-        <var-decl name='CallStaticObjectMethodA' type-id='99ff6e15' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
+        <var-decl name='CallStaticObjectMethodA' type-id='e4ddaae2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3744'>
-        <var-decl name='CallStaticBooleanMethod' type-id='ef643188' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
+        <var-decl name='CallStaticBooleanMethod' type-id='cf23ae6b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='CallStaticBooleanMethodV' type-id='c5b41ba9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
+        <var-decl name='CallStaticBooleanMethodV' type-id='fe34ddeb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3808'>
-        <var-decl name='CallStaticBooleanMethodA' type-id='572f4d46' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
+        <var-decl name='CallStaticBooleanMethodA' type-id='6500e0d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='CallStaticByteMethod' type-id='0c9c949f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
+        <var-decl name='CallStaticByteMethod' type-id='9672ceab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3872'>
-        <var-decl name='CallStaticByteMethodV' type-id='3ba4d298' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
+        <var-decl name='CallStaticByteMethodV' type-id='68dff1ab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='CallStaticByteMethodA' type-id='8c288679' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
+        <var-decl name='CallStaticByteMethodA' type-id='e1233a95' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3936'>
-        <var-decl name='CallStaticCharMethod' type-id='f452c4f3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
+        <var-decl name='CallStaticCharMethod' type-id='74c6bbc1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='CallStaticCharMethodV' type-id='2370212c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
+        <var-decl name='CallStaticCharMethodV' type-id='c99edb51' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4000'>
-        <var-decl name='CallStaticCharMethodA' type-id='93027c5d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
+        <var-decl name='CallStaticCharMethodA' type-id='9aa3a30b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='CallStaticShortMethod' type-id='322ef220' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
+        <var-decl name='CallStaticShortMethod' type-id='7613d7f9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4064'>
-        <var-decl name='CallStaticShortMethodV' type-id='34661db1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
+        <var-decl name='CallStaticShortMethodV' type-id='cb27a9e9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='CallStaticShortMethodA' type-id='3b95ca3e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
+        <var-decl name='CallStaticShortMethodA' type-id='6fa6efa3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4128'>
-        <var-decl name='CallStaticIntMethod' type-id='322ef221' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
+        <var-decl name='CallStaticIntMethod' type-id='03edf0e8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='CallStaticIntMethodV' type-id='34661db2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
+        <var-decl name='CallStaticIntMethodV' type-id='4186fd90' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4192'>
-        <var-decl name='CallStaticIntMethodA' type-id='3b95ca3f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
+        <var-decl name='CallStaticIntMethodA' type-id='b733d2a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='CallStaticLongMethod' type-id='322ef222' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
+        <var-decl name='CallStaticLongMethod' type-id='ac0692ef' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4256'>
-        <var-decl name='CallStaticLongMethodV' type-id='34661db3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
+        <var-decl name='CallStaticLongMethodV' type-id='69e037a7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4288'>
-        <var-decl name='CallStaticLongMethodA' type-id='3b95ca40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
+        <var-decl name='CallStaticLongMethodA' type-id='930f7049' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4320'>
-        <var-decl name='CallStaticFloatMethod' type-id='7814c8ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
+        <var-decl name='CallStaticFloatMethod' type-id='22bf7509' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4352'>
-        <var-decl name='CallStaticFloatMethodV' type-id='3f0de1fe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
+        <var-decl name='CallStaticFloatMethodV' type-id='64f0f239' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4384'>
-        <var-decl name='CallStaticFloatMethodA' type-id='90e24e07' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
+        <var-decl name='CallStaticFloatMethodA' type-id='ffa14fb3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='CallStaticDoubleMethod' type-id='c9aa1572' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
+        <var-decl name='CallStaticDoubleMethod' type-id='9a728e42' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4448'>
-        <var-decl name='CallStaticDoubleMethodV' type-id='397e8683' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
+        <var-decl name='CallStaticDoubleMethodV' type-id='b5141f8a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4480'>
-        <var-decl name='CallStaticDoubleMethodA' type-id='f1af99f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
+        <var-decl name='CallStaticDoubleMethodA' type-id='37d8dbc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4512'>
-        <var-decl name='CallStaticVoidMethod' type-id='3d342907' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='343' column='1'/>
+        <var-decl name='CallStaticVoidMethod' type-id='23df0f63' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='343' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4544'>
-        <var-decl name='CallStaticVoidMethodV' type-id='806c2c50' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='344' column='1'/>
+        <var-decl name='CallStaticVoidMethodV' type-id='54ed3183' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='344' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4576'>
-        <var-decl name='CallStaticVoidMethodA' type-id='372c8441' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='345' column='1'/>
+        <var-decl name='CallStaticVoidMethodA' type-id='4ddca04d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='345' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='GetStaticFieldID' type-id='234a6cd4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
+        <var-decl name='GetStaticFieldID' type-id='a316ff5e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4640'>
-        <var-decl name='GetStaticObjectField' type-id='ccec23f4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
+        <var-decl name='GetStaticObjectField' type-id='fda9c1a1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4672'>
-        <var-decl name='GetStaticBooleanField' type-id='b6cba737' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
+        <var-decl name='GetStaticBooleanField' type-id='9c44123a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4704'>
-        <var-decl name='GetStaticByteField' type-id='1fa86400' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
+        <var-decl name='GetStaticByteField' type-id='95e124fa' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4736'>
-        <var-decl name='GetStaticCharField' type-id='539eccec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
+        <var-decl name='GetStaticCharField' type-id='2c2f7dfc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4768'>
-        <var-decl name='GetStaticShortField' type-id='5cd6fe7f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
+        <var-decl name='GetStaticShortField' type-id='92632084' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='GetStaticIntField' type-id='5cd6fe80' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
+        <var-decl name='GetStaticIntField' type-id='cdbc23ed' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4832'>
-        <var-decl name='GetStaticLongField' type-id='5cd6fe81' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
+        <var-decl name='GetStaticLongField' type-id='3e4a17a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4864'>
-        <var-decl name='GetStaticFloatField' type-id='1dd3489a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
+        <var-decl name='GetStaticFloatField' type-id='cd849574' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4896'>
-        <var-decl name='GetStaticDoubleField' type-id='7c5a95b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
+        <var-decl name='GetStaticDoubleField' type-id='e2ca7deb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4928'>
-        <var-decl name='SetStaticObjectField' type-id='a479abce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='360' column='1'/>
+        <var-decl name='SetStaticObjectField' type-id='4e3962d3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4960'>
-        <var-decl name='SetStaticBooleanField' type-id='70ef270d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='361' column='1'/>
+        <var-decl name='SetStaticBooleanField' type-id='276cdb48' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='361' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
-        <var-decl name='SetStaticByteField' type-id='9bda8fea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='362' column='1'/>
+        <var-decl name='SetStaticByteField' type-id='cc949b48' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5024'>
-        <var-decl name='SetStaticCharField' type-id='05b410f6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='363' column='1'/>
+        <var-decl name='SetStaticCharField' type-id='13ff5ed6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='363' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5056'>
-        <var-decl name='SetStaticShortField' type-id='625ca385' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='364' column='1'/>
+        <var-decl name='SetStaticShortField' type-id='f595227e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5088'>
-        <var-decl name='SetStaticIntField' type-id='625ca386' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='365' column='1'/>
+        <var-decl name='SetStaticIntField' type-id='4cf405ef' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='365' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='SetStaticLongField' type-id='625ca387' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='366' column='1'/>
+        <var-decl name='SetStaticLongField' type-id='2ee87a2c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='366' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5152'>
-        <var-decl name='SetStaticFloatField' type-id='1171d1b4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='367' column='1'/>
+        <var-decl name='SetStaticFloatField' type-id='033b4c5a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='367' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5184'>
-        <var-decl name='SetStaticDoubleField' type-id='7c24b203' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='368' column='1'/>
+        <var-decl name='SetStaticDoubleField' type-id='4effcdf5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='368' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5216'>
-        <var-decl name='NewString' type-id='b2c6c541' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
+        <var-decl name='NewString' type-id='242c266a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5248'>
-        <var-decl name='GetStringLength' type-id='1a7dde06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
+        <var-decl name='GetStringLength' type-id='79969dbf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5280'>
-        <var-decl name='GetStringChars' type-id='fff004b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='372' column='1'/>
+        <var-decl name='GetStringChars' type-id='6ff55ba7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='372' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='ReleaseStringChars' type-id='c05a64c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='373' column='1'/>
+        <var-decl name='ReleaseStringChars' type-id='7f5a3d5b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='373' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5344'>
-        <var-decl name='NewStringUTF' type-id='a3339ebc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
+        <var-decl name='NewStringUTF' type-id='64bd18fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5376'>
-        <var-decl name='GetStringUTFLength' type-id='1a7dde06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
+        <var-decl name='GetStringUTFLength' type-id='79969dbf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5408'>
-        <var-decl name='GetStringUTFChars' type-id='4bc76f1c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='377' column='1'/>
+        <var-decl name='GetStringUTFChars' type-id='c53ff811' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='377' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5440'>
-        <var-decl name='ReleaseStringUTFChars' type-id='7c2a9d98' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='378' column='1'/>
+        <var-decl name='ReleaseStringUTFChars' type-id='e00b6cf9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='378' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5472'>
-        <var-decl name='GetArrayLength' type-id='d57c164e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
+        <var-decl name='GetArrayLength' type-id='7dba8e29' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='NewObjectArray' type-id='61b688b0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
+        <var-decl name='NewObjectArray' type-id='5b4efdbb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5536'>
-        <var-decl name='GetObjectArrayElement' type-id='9a5725d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
+        <var-decl name='GetObjectArrayElement' type-id='e14e5747' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
-        <var-decl name='SetObjectArrayElement' type-id='9b7fadc5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='382' column='1'/>
+        <var-decl name='SetObjectArrayElement' type-id='57fbc9df' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='382' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5600'>
-        <var-decl name='NewBooleanArray' type-id='8847feac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
+        <var-decl name='NewBooleanArray' type-id='0b42cefb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5632'>
-        <var-decl name='NewByteArray' type-id='3fcb62e2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
+        <var-decl name='NewByteArray' type-id='39b8aabb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5664'>
-        <var-decl name='NewCharArray' type-id='9a623a5c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
+        <var-decl name='NewCharArray' type-id='99291eb1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5696'>
-        <var-decl name='NewShortArray' type-id='86d5bf12' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
+        <var-decl name='NewShortArray' type-id='887705e9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5728'>
-        <var-decl name='NewIntArray' type-id='e5fd5491' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
+        <var-decl name='NewIntArray' type-id='e1012f14' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5760'>
-        <var-decl name='NewLongArray' type-id='64c5934e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
+        <var-decl name='NewLongArray' type-id='2175e977' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5792'>
-        <var-decl name='NewFloatArray' type-id='e7cc9f5a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
+        <var-decl name='NewFloatArray' type-id='0ec38739' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5824'>
-        <var-decl name='NewDoubleArray' type-id='452d9f35' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
+        <var-decl name='NewDoubleArray' type-id='7ba19e0e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5856'>
-        <var-decl name='GetBooleanArrayElements' type-id='affaefeb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='393' column='1'/>
+        <var-decl name='GetBooleanArrayElements' type-id='595531d6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='393' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5888'>
-        <var-decl name='GetByteArrayElements' type-id='2c83c50b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='394' column='1'/>
+        <var-decl name='GetByteArrayElements' type-id='3c0f7990' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='394' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5920'>
-        <var-decl name='GetCharArrayElements' type-id='23f99073' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='395' column='1'/>
+        <var-decl name='GetCharArrayElements' type-id='181adbb0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5952'>
-        <var-decl name='GetShortArrayElements' type-id='8fb2e86b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='396' column='1'/>
+        <var-decl name='GetShortArrayElements' type-id='54b2e682' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='396' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5984'>
-        <var-decl name='GetIntArrayElements' type-id='434d567b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='397' column='1'/>
+        <var-decl name='GetIntArrayElements' type-id='049544dc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='397' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6016'>
-        <var-decl name='GetLongArrayElements' type-id='a5922fa3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='398' column='1'/>
+        <var-decl name='GetLongArrayElements' type-id='a04487d0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6048'>
-        <var-decl name='GetFloatArrayElements' type-id='9785d58b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='399' column='1'/>
+        <var-decl name='GetFloatArrayElements' type-id='f59e8a46' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6080'>
-        <var-decl name='GetDoubleArrayElements' type-id='f0c5b475' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='400' column='1'/>
+        <var-decl name='GetDoubleArrayElements' type-id='9d6db3c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6112'>
-        <var-decl name='ReleaseBooleanArrayElements' type-id='191aba0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='402' column='1'/>
+        <var-decl name='ReleaseBooleanArrayElements' type-id='4ba42953' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='402' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6144'>
-        <var-decl name='ReleaseByteArrayElements' type-id='34f80e06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='404' column='1'/>
+        <var-decl name='ReleaseByteArrayElements' type-id='c92c39bd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6176'>
-        <var-decl name='ReleaseCharArrayElements' type-id='2b0e4ff2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='406' column='1'/>
+        <var-decl name='ReleaseCharArrayElements' type-id='5721b4d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='406' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6208'>
-        <var-decl name='ReleaseShortArrayElements' type-id='33caa8c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='408' column='1'/>
+        <var-decl name='ReleaseShortArrayElements' type-id='dd48378b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='408' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='ReleaseIntArrayElements' type-id='44f25f18' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='410' column='1'/>
+        <var-decl name='ReleaseIntArrayElements' type-id='f0699eed' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6272'>
-        <var-decl name='ReleaseLongArrayElements' type-id='b76b1db6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='412' column='1'/>
+        <var-decl name='ReleaseLongArrayElements' type-id='27cc1a95' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='412' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6304'>
-        <var-decl name='ReleaseFloatArrayElements' type-id='a522e978' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='414' column='1'/>
+        <var-decl name='ReleaseFloatArrayElements' type-id='6a6a41af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='414' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6336'>
-        <var-decl name='ReleaseDoubleArrayElements' type-id='f1850b08' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='416' column='1'/>
+        <var-decl name='ReleaseDoubleArrayElements' type-id='349137e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='416' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6368'>
-        <var-decl name='GetBooleanArrayRegion' type-id='a46b0935' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='419' column='1'/>
+        <var-decl name='GetBooleanArrayRegion' type-id='fcef0014' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='419' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6400'>
-        <var-decl name='GetByteArrayRegion' type-id='f7a0379f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='421' column='1'/>
+        <var-decl name='GetByteArrayRegion' type-id='6c42c76e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6432'>
-        <var-decl name='GetCharArrayRegion' type-id='545a856f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='423' column='1'/>
+        <var-decl name='GetCharArrayRegion' type-id='4c985d6a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6464'>
-        <var-decl name='GetShortArrayRegion' type-id='e1be4c89' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='425' column='1'/>
+        <var-decl name='GetShortArrayRegion' type-id='57269ef0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='425' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6496'>
-        <var-decl name='GetIntArrayRegion' type-id='792859dd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='427' column='1'/>
+        <var-decl name='GetIntArrayRegion' type-id='b903acea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='427' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6528'>
-        <var-decl name='GetLongArrayRegion' type-id='1e124adf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='429' column='1'/>
+        <var-decl name='GetLongArrayRegion' type-id='46cfa96e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='429' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6560'>
-        <var-decl name='GetFloatArrayRegion' type-id='21f41051' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='431' column='1'/>
+        <var-decl name='GetFloatArrayRegion' type-id='d238e9f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6592'>
-        <var-decl name='GetDoubleArrayRegion' type-id='b251d72d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='433' column='1'/>
+        <var-decl name='GetDoubleArrayRegion' type-id='f0756a0a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6624'>
-        <var-decl name='SetBooleanArrayRegion' type-id='f51198ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='437' column='1'/>
+        <var-decl name='SetBooleanArrayRegion' type-id='9578bd3d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6656'>
-        <var-decl name='SetByteArrayRegion' type-id='81c03d6c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='439' column='1'/>
+        <var-decl name='SetByteArrayRegion' type-id='963f4759' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='439' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6688'>
-        <var-decl name='SetCharArrayRegion' type-id='e08d371c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='441' column='1'/>
+        <var-decl name='SetCharArrayRegion' type-id='1b5bab1d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6720'>
-        <var-decl name='SetShortArrayRegion' type-id='82203b3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='443' column='1'/>
+        <var-decl name='SetShortArrayRegion' type-id='1167e98d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='443' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6752'>
-        <var-decl name='SetIntArrayRegion' type-id='2ccb7754' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='445' column='1'/>
+        <var-decl name='SetIntArrayRegion' type-id='67616213' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6784'>
-        <var-decl name='SetLongArrayRegion' type-id='c1bcf4ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='447' column='1'/>
+        <var-decl name='SetLongArrayRegion' type-id='fa7b64f1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6816'>
-        <var-decl name='SetFloatArrayRegion' type-id='950241b0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='449' column='1'/>
+        <var-decl name='SetFloatArrayRegion' type-id='47cf6701' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='SetDoubleArrayRegion' type-id='a733b71a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='451' column='1'/>
+        <var-decl name='SetDoubleArrayRegion' type-id='bc788285' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='451' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6880'>
-        <var-decl name='RegisterNatives' type-id='0c62a17c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
+        <var-decl name='RegisterNatives' type-id='384bcd95' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6912'>
-        <var-decl name='UnregisterNatives' type-id='41173bbb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
+        <var-decl name='UnregisterNatives' type-id='c4a66594' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6944'>
-        <var-decl name='MonitorEnter' type-id='0dbd0b28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
+        <var-decl name='MonitorEnter' type-id='99b71f83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='MonitorExit' type-id='0dbd0b28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
+        <var-decl name='MonitorExit' type-id='99b71f83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7008'>
-        <var-decl name='GetJavaVM' type-id='19620ff1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
+        <var-decl name='GetJavaVM' type-id='5a6d41b9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='GetStringRegion' type-id='bd3e8fb9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='461' column='1'/>
+        <var-decl name='GetStringRegion' type-id='954e4e32' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7072'>
-        <var-decl name='GetStringUTFRegion' type-id='0c1914a7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='462' column='1'/>
+        <var-decl name='GetStringUTFRegion' type-id='d30f44a2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7104'>
-        <var-decl name='GetPrimitiveArrayCritical' type-id='32c7d509' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='464' column='1'/>
+        <var-decl name='GetPrimitiveArrayCritical' type-id='a9defe9a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7136'>
-        <var-decl name='ReleasePrimitiveArrayCritical' type-id='bf254042' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='465' column='1'/>
+        <var-decl name='ReleasePrimitiveArrayCritical' type-id='0caa0dcf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7168'>
-        <var-decl name='GetStringCritical' type-id='fff004b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='467' column='1'/>
+        <var-decl name='GetStringCritical' type-id='6ff55ba7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='467' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7200'>
-        <var-decl name='ReleaseStringCritical' type-id='c05a64c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='468' column='1'/>
+        <var-decl name='ReleaseStringCritical' type-id='7f5a3d5b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7232'>
-        <var-decl name='NewWeakGlobalRef' type-id='e8d65642' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
+        <var-decl name='NewWeakGlobalRef' type-id='1d2b5c3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7264'>
-        <var-decl name='DeleteWeakGlobalRef' type-id='f34f71b6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='471' column='1'/>
+        <var-decl name='DeleteWeakGlobalRef' type-id='c2029967' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7296'>
-        <var-decl name='ExceptionCheck' type-id='c6d2cb52' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
+        <var-decl name='ExceptionCheck' type-id='cf6ba1d9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7328'>
-        <var-decl name='NewDirectByteBuffer' type-id='ad0b765a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
+        <var-decl name='NewDirectByteBuffer' type-id='394cbbe6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
-        <var-decl name='GetDirectBufferAddress' type-id='23103ee5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='476' column='1'/>
+        <var-decl name='GetDirectBufferAddress' type-id='d4993206' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='476' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7392'>
-        <var-decl name='GetDirectBufferCapacity' type-id='0dbd0b29' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
+        <var-decl name='GetDirectBufferCapacity' type-id='0350b462' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='GetObjectRefType' type-id='3f4a2861' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
+        <var-decl name='GetObjectRefType' type-id='25acc26a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='_JNIEnv' is-struct='yes' visibility='default' size-in-bits='32' filepath='libnativehelper/include_jni/jni.h' line='489' column='1' hash='1adee3dd8c9092c5' id='c9459134'>
@@ -2963,7 +2963,7 @@ 
     <qualified-type-def type-id='a84c031d' const='yes' hash='2059efede605db28' id='9b45d938'/>
     <reference-type-def kind='lvalue' type-id='9b45d938' size-in-bits='32' hash='5946cd19ca90d1dc' id='8cf4ca3a'/>
     <pointer-type-def type-id='9b45d938' size-in-bits='32' hash='fbba1ba8411df024' id='80f4b756'/>
-    <pointer-type-def type-id='4693c583' size-in-bits='32' hash='531124cd9d1b54e6' id='4bc76f1c'/>
+    <pointer-type-def type-id='9a362d2a' size-in-bits='32' hash='531124cd9d1b54e6' id='c53ff811'/>
     <pointer-type-def type-id='80f4b756' size-in-bits='32' hash='5b500e75967ca9f' id='7d3cd834'/>
     <qualified-type-def type-id='801a266d' const='yes' hash='e584588d23e21a1f' id='e7c31614'/>
     <reference-type-def kind='lvalue' type-id='e7c31614' size-in-bits='32' hash='8c20d0c628158f5b' id='0a1bf0b6'/>
@@ -2983,7 +2983,7 @@ 
     <pointer-type-def type-id='3ebf19c8' size-in-bits='32' hash='da7ae41265c21095' id='a8d5bec6'/>
     <qualified-type-def type-id='8dfe2e06' const='yes' hash='75876eef37a2aa1e' id='9bf2d596'/>
     <pointer-type-def type-id='9bf2d596' size-in-bits='32' hash='6ebdd71c5afe699a' id='3b4676f4'/>
-    <pointer-type-def type-id='6a9e3459' size-in-bits='32' hash='531124cd9d1b54e6' id='fff004b2'/>
+    <pointer-type-def type-id='138afd90' size-in-bits='32' hash='531124cd9d1b54e6' id='6ff55ba7'/>
     <qualified-type-def type-id='973e3c3f' const='yes' hash='a3ca19443c4c0e63' id='8bac99cf'/>
     <pointer-type-def type-id='8bac99cf' size-in-bits='32' hash='bc01492b66f302c8' id='c5b6437f'/>
     <qualified-type-def type-id='1a7fe6b0' const='yes' hash='bde58913d5ca1919' id='af8c6a20'/>
@@ -3699,164 +3699,164 @@ 
     <qualified-type-def type-id='7292109c' const='yes' hash='ba7b477db2c3e318' id='5a5c0787'/>
     <reference-type-def kind='lvalue' type-id='5a5c0787' size-in-bits='32' hash='d50bcd42f5c762bc' id='dfe00273'/>
     <reference-type-def kind='lvalue' type-id='7292109c' size-in-bits='32' hash='f0f6fc0047cb8e05' id='15f054ce'/>
-    <pointer-type-def type-id='c2ab665d' size-in-bits='32' hash='531124cd9d1b54e6' id='c6d2cb52'/>
-    <pointer-type-def type-id='ca1de4b9' size-in-bits='32' hash='531124cd9d1b54e6' id='f42dbf4e'/>
-    <pointer-type-def type-id='6f7cb7b4' size-in-bits='32' hash='531124cd9d1b54e6' id='b6cba737'/>
-    <pointer-type-def type-id='9d54666b' size-in-bits='32' hash='531124cd9d1b54e6' id='ef643188'/>
-    <pointer-type-def type-id='eda358d5' size-in-bits='32' hash='531124cd9d1b54e6' id='572f4d46'/>
-    <pointer-type-def type-id='fe376334' size-in-bits='32' hash='531124cd9d1b54e6' id='c5b41ba9'/>
-    <pointer-type-def type-id='2207a1d4' size-in-bits='32' hash='531124cd9d1b54e6' id='af9b66a1'/>
-    <pointer-type-def type-id='ec86bf87' size-in-bits='32' hash='531124cd9d1b54e6' id='70076aa2'/>
-    <pointer-type-def type-id='b3920ec1' size-in-bits='32' hash='531124cd9d1b54e6' id='fdb6d1a8'/>
-    <pointer-type-def type-id='d44533d0' size-in-bits='32' hash='531124cd9d1b54e6' id='f7295393'/>
-    <pointer-type-def type-id='635e0a25' size-in-bits='32' hash='531124cd9d1b54e6' id='8c01ad3c'/>
-    <pointer-type-def type-id='161aeec2' size-in-bits='32' hash='531124cd9d1b54e6' id='c5017f63'/>
-    <pointer-type-def type-id='40138048' size-in-bits='32' hash='531124cd9d1b54e6' id='286a904d'/>
-    <pointer-type-def type-id='f1f2c7f3' size-in-bits='32' hash='531124cd9d1b54e6' id='9b7e723c'/>
-    <pointer-type-def type-id='6a7bb135' size-in-bits='32' hash='531124cd9d1b54e6' id='d2595e76'/>
+    <pointer-type-def type-id='e5bd5c7c' size-in-bits='32' hash='531124cd9d1b54e6' id='cf6ba1d9'/>
+    <pointer-type-def type-id='bfece280' size-in-bits='32' hash='531124cd9d1b54e6' id='51a12745'/>
+    <pointer-type-def type-id='16c0590f' size-in-bits='32' hash='531124cd9d1b54e6' id='9c44123a'/>
+    <pointer-type-def type-id='64b352ce' size-in-bits='32' hash='531124cd9d1b54e6' id='cf23ae6b'/>
+    <pointer-type-def type-id='a6eaa9f4' size-in-bits='32' hash='531124cd9d1b54e6' id='6500e0d5'/>
+    <pointer-type-def type-id='0224b00e' size-in-bits='32' hash='531124cd9d1b54e6' id='fe34ddeb'/>
+    <pointer-type-def type-id='f0a16cf3' size-in-bits='32' hash='531124cd9d1b54e6' id='edf75eb0'/>
+    <pointer-type-def type-id='af1e5937' size-in-bits='32' hash='531124cd9d1b54e6' id='365ad2dc'/>
+    <pointer-type-def type-id='58fcbf31' size-in-bits='32' hash='531124cd9d1b54e6' id='03b4d21a'/>
+    <pointer-type-def type-id='05c1e46f' size-in-bits='32' hash='531124cd9d1b54e6' id='14a5b6bc'/>
+    <pointer-type-def type-id='79acd688' size-in-bits='32' hash='531124cd9d1b54e6' id='4a3ee6bf'/>
+    <pointer-type-def type-id='ad6651c5' size-in-bits='32' hash='531124cd9d1b54e6' id='d45ba39e'/>
+    <pointer-type-def type-id='906c7e7f' size-in-bits='32' hash='531124cd9d1b54e6' id='214c5f44'/>
+    <pointer-type-def type-id='6f046d6d' size-in-bits='32' hash='531124cd9d1b54e6' id='e6dd1f9e'/>
+    <pointer-type-def type-id='86c14eea' size-in-bits='32' hash='531124cd9d1b54e6' id='e089ff87'/>
     <pointer-type-def type-id='cc6e09ca' size-in-bits='32' hash='59c5516c8a939360' id='d4a328b7'/>
-    <pointer-type-def type-id='1704c89a' size-in-bits='32' hash='531124cd9d1b54e6' id='affaefeb'/>
-    <pointer-type-def type-id='72c33ddb' size-in-bits='32' hash='531124cd9d1b54e6' id='8847feac'/>
-    <pointer-type-def type-id='76032d71' size-in-bits='32' hash='531124cd9d1b54e6' id='1fa86400'/>
-    <pointer-type-def type-id='47ca8d46' size-in-bits='32' hash='531124cd9d1b54e6' id='0c9c949f'/>
-    <pointer-type-def type-id='36acdbcc' size-in-bits='32' hash='531124cd9d1b54e6' id='8c288679'/>
-    <pointer-type-def type-id='c1b550c7' size-in-bits='32' hash='531124cd9d1b54e6' id='3ba4d298'/>
-    <pointer-type-def type-id='3c662e98' size-in-bits='32' hash='531124cd9d1b54e6' id='b90b8f9b'/>
-    <pointer-type-def type-id='8ae90496' size-in-bits='32' hash='531124cd9d1b54e6' id='72aad4c5'/>
-    <pointer-type-def type-id='d35f73d9' size-in-bits='32' hash='531124cd9d1b54e6' id='19e79f04'/>
-    <pointer-type-def type-id='d6f3cc1e' size-in-bits='32' hash='531124cd9d1b54e6' id='11c5f5c9'/>
-    <pointer-type-def type-id='521af3a9' size-in-bits='32' hash='531124cd9d1b54e6' id='a6e4e20e'/>
-    <pointer-type-def type-id='4aa4e453' size-in-bits='32' hash='531124cd9d1b54e6' id='7e64ceb4'/>
-    <pointer-type-def type-id='b062a33a' size-in-bits='32' hash='531124cd9d1b54e6' id='b73332bf'/>
+    <pointer-type-def type-id='44c6cc4b' size-in-bits='32' hash='531124cd9d1b54e6' id='595531d6'/>
+    <pointer-type-def type-id='3fe1cc52' size-in-bits='32' hash='531124cd9d1b54e6' id='0b42cefb'/>
+    <pointer-type-def type-id='dbabdcaf' size-in-bits='32' hash='531124cd9d1b54e6' id='95e124fa'/>
+    <pointer-type-def type-id='fe53f0ee' size-in-bits='32' hash='531124cd9d1b54e6' id='9672ceab'/>
+    <pointer-type-def type-id='ddb48714' size-in-bits='32' hash='531124cd9d1b54e6' id='e1233a95'/>
+    <pointer-type-def type-id='520e32ee' size-in-bits='32' hash='531124cd9d1b54e6' id='68dff1ab'/>
+    <pointer-type-def type-id='5b6b8457' size-in-bits='32' hash='531124cd9d1b54e6' id='19f8581c'/>
+    <pointer-type-def type-id='7e2725d1' size-in-bits='32' hash='531124cd9d1b54e6' id='95eb11da'/>
+    <pointer-type-def type-id='cbae85cf' size-in-bits='32' hash='531124cd9d1b54e6' id='c45ae27c'/>
+    <pointer-type-def type-id='34294ba8' size-in-bits='32' hash='531124cd9d1b54e6' id='5750967f'/>
+    <pointer-type-def type-id='5131b3e5' size-in-bits='32' hash='531124cd9d1b54e6' id='d3e60ade'/>
+    <pointer-type-def type-id='baa6c01f' size-in-bits='32' hash='531124cd9d1b54e6' id='483faa04'/>
+    <pointer-type-def type-id='adbcd94d' size-in-bits='32' hash='531124cd9d1b54e6' id='ac58975e'/>
     <pointer-type-def type-id='adf18958' size-in-bits='32' hash='4110cb83867d1985' id='a6979e77'/>
-    <pointer-type-def type-id='c6492f6c' size-in-bits='32' hash='531124cd9d1b54e6' id='2c83c50b'/>
-    <pointer-type-def type-id='23a084d1' size-in-bits='32' hash='531124cd9d1b54e6' id='3fcb62e2'/>
-    <pointer-type-def type-id='1c231d7d' size-in-bits='32' hash='531124cd9d1b54e6' id='539eccec'/>
-    <pointer-type-def type-id='c60ec5ea' size-in-bits='32' hash='531124cd9d1b54e6' id='f452c4f3'/>
-    <pointer-type-def type-id='63e40290' size-in-bits='32' hash='531124cd9d1b54e6' id='93027c5d'/>
-    <pointer-type-def type-id='b58a040b' size-in-bits='32' hash='531124cd9d1b54e6' id='2370212c'/>
-    <pointer-type-def type-id='c71e554c' size-in-bits='32' hash='531124cd9d1b54e6' id='3f53351f'/>
-    <pointer-type-def type-id='48a0988a' size-in-bits='32' hash='531124cd9d1b54e6' id='de836af9'/>
-    <pointer-type-def type-id='4543f86d' size-in-bits='32' hash='531124cd9d1b54e6' id='60ba8818'/>
-    <pointer-type-def type-id='024b2e02' size-in-bits='32' hash='531124cd9d1b54e6' id='340bfd9d'/>
-    <pointer-type-def type-id='72b5ef45' size-in-bits='32' hash='531124cd9d1b54e6' id='abb6ff0a'/>
-    <pointer-type-def type-id='4d6cc7ff' size-in-bits='32' hash='531124cd9d1b54e6' id='18ca9f30'/>
-    <pointer-type-def type-id='171c33c6' size-in-bits='32' hash='531124cd9d1b54e6' id='3940caeb'/>
+    <pointer-type-def type-id='51c807eb' size-in-bits='32' hash='531124cd9d1b54e6' id='3c0f7990'/>
+    <pointer-type-def type-id='10d8a2b2' size-in-bits='32' hash='531124cd9d1b54e6' id='39b8aabb'/>
+    <pointer-type-def type-id='a7f7fff9' size-in-bits='32' hash='531124cd9d1b54e6' id='2c2f7dfc'/>
+    <pointer-type-def type-id='ac63458c' size-in-bits='32' hash='531124cd9d1b54e6' id='74c6bbc1'/>
+    <pointer-type-def type-id='6c0ad14a' size-in-bits='32' hash='531124cd9d1b54e6' id='9aa3a30b'/>
+    <pointer-type-def type-id='c648ecac' size-in-bits='32' hash='531124cd9d1b54e6' id='c99edb51'/>
+    <pointer-type-def type-id='0d5e3ea5' size-in-bits='32' hash='531124cd9d1b54e6' id='a0a864ea'/>
+    <pointer-type-def type-id='2d81735f' size-in-bits='32' hash='531124cd9d1b54e6' id='3d1c1990'/>
+    <pointer-type-def type-id='1642288d' size-in-bits='32' hash='531124cd9d1b54e6' id='e08f90b2'/>
+    <pointer-type-def type-id='9a879f12' size-in-bits='32' hash='531124cd9d1b54e6' id='002b51d9'/>
+    <pointer-type-def type-id='1b9d7d93' size-in-bits='32' hash='531124cd9d1b54e6' id='4eccfcec'/>
+    <pointer-type-def type-id='229ae47d' size-in-bits='32' hash='531124cd9d1b54e6' id='ae8575aa'/>
+    <pointer-type-def type-id='0681baf3' size-in-bits='32' hash='531124cd9d1b54e6' id='ebd01c4c'/>
     <pointer-type-def type-id='8dfe2e06' size-in-bits='32' hash='f899eda6ea6ebce9' id='071e4e5d'/>
-    <pointer-type-def type-id='062cf4ec' size-in-bits='32' hash='531124cd9d1b54e6' id='23f99073'/>
-    <pointer-type-def type-id='2362799b' size-in-bits='32' hash='531124cd9d1b54e6' id='9a623a5c'/>
-    <pointer-type-def type-id='e7767992' size-in-bits='32' hash='531124cd9d1b54e6' id='2b174cab'/>
-    <pointer-type-def type-id='6b5969a6' size-in-bits='32' hash='531124cd9d1b54e6' id='30ee23e3'/>
-    <pointer-type-def type-id='41d77b1c' size-in-bits='32' hash='531124cd9d1b54e6' id='a96e9567'/>
-    <pointer-type-def type-id='541d431d' size-in-bits='32' hash='531124cd9d1b54e6' id='15829ccc'/>
-    <pointer-type-def type-id='0fbe2cda' size-in-bits='32' hash='531124cd9d1b54e6' id='7c5a95b5'/>
-    <pointer-type-def type-id='1ce8356d' size-in-bits='32' hash='531124cd9d1b54e6' id='c9aa1572'/>
-    <pointer-type-def type-id='0257c247' size-in-bits='32' hash='531124cd9d1b54e6' id='f1af99f8'/>
-    <pointer-type-def type-id='9f8e2b3e' size-in-bits='32' hash='531124cd9d1b54e6' id='397e8683'/>
-    <pointer-type-def type-id='5c9d1bb1' size-in-bits='32' hash='531124cd9d1b54e6' id='7c6967e4'/>
-    <pointer-type-def type-id='7cc5073b' size-in-bits='32' hash='531124cd9d1b54e6' id='9aee4982'/>
-    <pointer-type-def type-id='f6f688b2' size-in-bits='32' hash='531124cd9d1b54e6' id='06674af5'/>
-    <pointer-type-def type-id='9ee61f63' size-in-bits='32' hash='531124cd9d1b54e6' id='3d49369a'/>
-    <pointer-type-def type-id='47aa8c3c' size-in-bits='32' hash='531124cd9d1b54e6' id='e06b46ad'/>
-    <pointer-type-def type-id='6b33627a' size-in-bits='32' hash='531124cd9d1b54e6' id='0aafbc07'/>
-    <pointer-type-def type-id='039aab3d' size-in-bits='32' hash='531124cd9d1b54e6' id='fd720bfe'/>
+    <pointer-type-def type-id='68768207' size-in-bits='32' hash='531124cd9d1b54e6' id='181adbb0'/>
+    <pointer-type-def type-id='fec334c0' size-in-bits='32' hash='531124cd9d1b54e6' id='99291eb1'/>
+    <pointer-type-def type-id='4962a6a9' size-in-bits='32' hash='531124cd9d1b54e6' id='0701e7a2'/>
+    <pointer-type-def type-id='9096ef22' size-in-bits='32' hash='531124cd9d1b54e6' id='93fe72f9'/>
+    <pointer-type-def type-id='0c0fb02e' size-in-bits='32' hash='531124cd9d1b54e6' id='96a2b59f'/>
+    <pointer-type-def type-id='ee9f7f1d' size-in-bits='32' hash='531124cd9d1b54e6' id='b769f8ce'/>
+    <pointer-type-def type-id='daa62f6c' size-in-bits='32' hash='531124cd9d1b54e6' id='e2ca7deb'/>
+    <pointer-type-def type-id='fbd11c11' size-in-bits='32' hash='531124cd9d1b54e6' id='9a728e42'/>
+    <pointer-type-def type-id='41d3ee1b' size-in-bits='32' hash='531124cd9d1b54e6' id='37d8dbc8'/>
+    <pointer-type-def type-id='da5f3921' size-in-bits='32' hash='531124cd9d1b54e6' id='b5141f8a'/>
+    <pointer-type-def type-id='c76018ba' size-in-bits='32' hash='531124cd9d1b54e6' id='47bd5aa3'/>
+    <pointer-type-def type-id='8e8d8560' size-in-bits='32' hash='531124cd9d1b54e6' id='974e7d0d'/>
+    <pointer-type-def type-id='462faf42' size-in-bits='32' hash='531124cd9d1b54e6' id='bcb23543'/>
+    <pointer-type-def type-id='50461049' size-in-bits='32' hash='531124cd9d1b54e6' id='cf64aecc'/>
+    <pointer-type-def type-id='7c6bd1bc' size-in-bits='32' hash='531124cd9d1b54e6' id='b76bba71'/>
+    <pointer-type-def type-id='beb693fa' size-in-bits='32' hash='531124cd9d1b54e6' id='99520b7b'/>
+    <pointer-type-def type-id='353c555c' size-in-bits='32' hash='531124cd9d1b54e6' id='cb41d9c1'/>
     <pointer-type-def type-id='973e3c3f' size-in-bits='32' hash='d6fa59bdf826c01d' id='6292c81e'/>
-    <pointer-type-def type-id='1b2606fc' size-in-bits='32' hash='531124cd9d1b54e6' id='f0c5b475'/>
-    <pointer-type-def type-id='b5b9ed34' size-in-bits='32' hash='531124cd9d1b54e6' id='452d9f35'/>
-    <pointer-type-def type-id='74c6e66d' size-in-bits='32' hash='531124cd9d1b54e6' id='234a6cd4'/>
-    <pointer-type-def type-id='18f35374' size-in-bits='32' hash='531124cd9d1b54e6' id='6098e447'/>
-    <pointer-type-def type-id='3ed49d13' size-in-bits='32' hash='531124cd9d1b54e6' id='1dd3489a'/>
-    <pointer-type-def type-id='c3f30acc' size-in-bits='32' hash='531124cd9d1b54e6' id='7814c8ad'/>
-    <pointer-type-def type-id='2baaba0a' size-in-bits='32' hash='531124cd9d1b54e6' id='90e24e07'/>
-    <pointer-type-def type-id='2e36b4ed' size-in-bits='32' hash='531124cd9d1b54e6' id='3f0de1fe'/>
-    <pointer-type-def type-id='14209476' size-in-bits='32' hash='531124cd9d1b54e6' id='bec66371'/>
-    <pointer-type-def type-id='06dcb13c' size-in-bits='32' hash='531124cd9d1b54e6' id='f1447c7b'/>
-    <pointer-type-def type-id='672db497' size-in-bits='32' hash='531124cd9d1b54e6' id='43ae4cf2'/>
-    <pointer-type-def type-id='7f8c4cf0' size-in-bits='32' hash='531124cd9d1b54e6' id='bae7b123'/>
-    <pointer-type-def type-id='28a5f5af' size-in-bits='32' hash='531124cd9d1b54e6' id='29b6037c'/>
-    <pointer-type-def type-id='89a65589' size-in-bits='32' hash='531124cd9d1b54e6' id='154c703a'/>
-    <pointer-type-def type-id='94426c08' size-in-bits='32' hash='531124cd9d1b54e6' id='e91668fd'/>
+    <pointer-type-def type-id='486b9cd1' size-in-bits='32' hash='531124cd9d1b54e6' id='9d6db3c8'/>
+    <pointer-type-def type-id='2c73abfd' size-in-bits='32' hash='531124cd9d1b54e6' id='7ba19e0e'/>
+    <pointer-type-def type-id='daecdf3d' size-in-bits='32' hash='531124cd9d1b54e6' id='a316ff5e'/>
+    <pointer-type-def type-id='7f3fc66e' size-in-bits='32' hash='531124cd9d1b54e6' id='b4201f3f'/>
+    <pointer-type-def type-id='08e81539' size-in-bits='32' hash='531124cd9d1b54e6' id='cd849574'/>
+    <pointer-type-def type-id='d0f1dd4c' size-in-bits='32' hash='531124cd9d1b54e6' id='22bf7509'/>
+    <pointer-type-def type-id='41c4608a' size-in-bits='32' hash='531124cd9d1b54e6' id='ffa14fb3'/>
+    <pointer-type-def type-id='c3775dec' size-in-bits='32' hash='531124cd9d1b54e6' id='64f0f239'/>
+    <pointer-type-def type-id='51d11665' size-in-bits='32' hash='531124cd9d1b54e6' id='0a890a42'/>
+    <pointer-type-def type-id='4c8d769f' size-in-bits='32' hash='531124cd9d1b54e6' id='47e937c8'/>
+    <pointer-type-def type-id='df8fe3cd' size-in-bits='32' hash='531124cd9d1b54e6' id='ff165b8a'/>
+    <pointer-type-def type-id='f9633a52' size-in-bits='32' hash='531124cd9d1b54e6' id='9202a511'/>
+    <pointer-type-def type-id='a5560353' size-in-bits='32' hash='531124cd9d1b54e6' id='09928654'/>
+    <pointer-type-def type-id='df291ebd' size-in-bits='32' hash='531124cd9d1b54e6' id='9f32ba72'/>
+    <pointer-type-def type-id='6732ad33' size-in-bits='32' hash='531124cd9d1b54e6' id='5ee3c214'/>
     <pointer-type-def type-id='1a7fe6b0' size-in-bits='32' hash='4e7634b70a405e85' id='d8263a65'/>
-    <pointer-type-def type-id='1c8e3a5a' size-in-bits='32' hash='531124cd9d1b54e6' id='9785d58b'/>
-    <pointer-type-def type-id='5321e7f1' size-in-bits='32' hash='531124cd9d1b54e6' id='e7cc9f5a'/>
-    <pointer-type-def type-id='f68d4a05' size-in-bits='32' hash='531124cd9d1b54e6' id='f3fd167a'/>
-    <pointer-type-def type-id='2fb8ba3e' size-in-bits='32' hash='531124cd9d1b54e6' id='19620ff1'/>
-    <pointer-type-def type-id='b02c2550' size-in-bits='32' hash='531124cd9d1b54e6' id='41173bbb'/>
-    <pointer-type-def type-id='eb909c09' size-in-bits='32' hash='531124cd9d1b54e6' id='0c62a17c'/>
-    <pointer-type-def type-id='46353f35' size-in-bits='32' hash='531124cd9d1b54e6' id='bbfa68cc'/>
-    <pointer-type-def type-id='ccb79e1c' size-in-bits='32' hash='531124cd9d1b54e6' id='5cd6fe80'/>
-    <pointer-type-def type-id='69749343' size-in-bits='32' hash='531124cd9d1b54e6' id='322ef221'/>
-    <pointer-type-def type-id='846957ad' size-in-bits='32' hash='531124cd9d1b54e6' id='3b95ca3f'/>
-    <pointer-type-def type-id='ae98ce5c' size-in-bits='32' hash='531124cd9d1b54e6' id='34661db2'/>
-    <pointer-type-def type-id='49080c66' size-in-bits='32' hash='531124cd9d1b54e6' id='e459a6af'/>
-    <pointer-type-def type-id='e375f1d9' size-in-bits='32' hash='531124cd9d1b54e6' id='0dbd0b28'/>
-    <pointer-type-def type-id='8ae4e70f' size-in-bits='32' hash='531124cd9d1b54e6' id='bd2b792b'/>
-    <pointer-type-def type-id='09e3e169' size-in-bits='32' hash='531124cd9d1b54e6' id='51953751'/>
-    <pointer-type-def type-id='f44a3fa8' size-in-bits='32' hash='531124cd9d1b54e6' id='5f5d06cc'/>
-    <pointer-type-def type-id='02d5f98d' size-in-bits='32' hash='531124cd9d1b54e6' id='e3d72665'/>
-    <pointer-type-def type-id='8f0b7f5a' size-in-bits='32' hash='531124cd9d1b54e6' id='0f8d5f3c'/>
-    <pointer-type-def type-id='9454c680' size-in-bits='32' hash='531124cd9d1b54e6' id='7b6e1be6'/>
-    <pointer-type-def type-id='292a411b' size-in-bits='32' hash='531124cd9d1b54e6' id='1c93d4e5'/>
-    <pointer-type-def type-id='1461dd30' size-in-bits='32' hash='531124cd9d1b54e6' id='797bd39f'/>
+    <pointer-type-def type-id='aab7be53' size-in-bits='32' hash='531124cd9d1b54e6' id='f59e8a46'/>
+    <pointer-type-def type-id='9decd400' size-in-bits='32' hash='531124cd9d1b54e6' id='0ec38739'/>
+    <pointer-type-def type-id='cb7ec8b5' size-in-bits='32' hash='531124cd9d1b54e6' id='7e62d932'/>
+    <pointer-type-def type-id='192148ae' size-in-bits='32' hash='531124cd9d1b54e6' id='5a6d41b9'/>
+    <pointer-type-def type-id='185cc89b' size-in-bits='32' hash='531124cd9d1b54e6' id='c4a66594'/>
+    <pointer-type-def type-id='b15a7c4e' size-in-bits='32' hash='531124cd9d1b54e6' id='384bcd95'/>
+    <pointer-type-def type-id='bc2d56ac' size-in-bits='32' hash='531124cd9d1b54e6' id='66017941'/>
+    <pointer-type-def type-id='252d62f6' size-in-bits='32' hash='531124cd9d1b54e6' id='cdbc23ed'/>
+    <pointer-type-def type-id='53da899f' size-in-bits='32' hash='531124cd9d1b54e6' id='03edf0e8'/>
+    <pointer-type-def type-id='db26a379' size-in-bits='32' hash='531124cd9d1b54e6' id='b733d2a6'/>
+    <pointer-type-def type-id='f0f9a897' size-in-bits='32' hash='531124cd9d1b54e6' id='4186fd90'/>
+    <pointer-type-def type-id='1f063e10' size-in-bits='32' hash='531124cd9d1b54e6' id='d48cb67f'/>
+    <pointer-type-def type-id='8d218ff2' size-in-bits='32' hash='531124cd9d1b54e6' id='99b71f83'/>
+    <pointer-type-def type-id='4b346528' size-in-bits='32' hash='531124cd9d1b54e6' id='4d7ba689'/>
+    <pointer-type-def type-id='9d003166' size-in-bits='32' hash='531124cd9d1b54e6' id='a594cd33'/>
+    <pointer-type-def type-id='a8a6d650' size-in-bits='32' hash='531124cd9d1b54e6' id='0d9ebbb9'/>
+    <pointer-type-def type-id='92f89d93' size-in-bits='32' hash='531124cd9d1b54e6' id='5203f86e'/>
+    <pointer-type-def type-id='aa58d93a' size-in-bits='32' hash='531124cd9d1b54e6' id='10997527'/>
+    <pointer-type-def type-id='280b89e0' size-in-bits='32' hash='531124cd9d1b54e6' id='6efc86e1'/>
+    <pointer-type-def type-id='a613f7c2' size-in-bits='32' hash='531124cd9d1b54e6' id='72203d5f'/>
+    <pointer-type-def type-id='a976ad33' size-in-bits='32' hash='531124cd9d1b54e6' id='ed039044'/>
     <pointer-type-def type-id='0b9c02cb' size-in-bits='32' hash='6f8c3ba079dc5120' id='7f83e8c4'/>
-    <pointer-type-def type-id='3aff0b18' size-in-bits='32' hash='531124cd9d1b54e6' id='434d567b'/>
-    <pointer-type-def type-id='7343f038' size-in-bits='32' hash='531124cd9d1b54e6' id='e5fd5491'/>
-    <pointer-type-def type-id='ccb79e1d' size-in-bits='32' hash='531124cd9d1b54e6#2' id='5cd6fe81'/>
-    <pointer-type-def type-id='69749344' size-in-bits='32' hash='531124cd9d1b54e6#2' id='322ef222'/>
-    <pointer-type-def type-id='846957ae' size-in-bits='32' hash='531124cd9d1b54e6#2' id='3b95ca40'/>
-    <pointer-type-def type-id='ae98ce5d' size-in-bits='32' hash='531124cd9d1b54e6#2' id='34661db3'/>
-    <pointer-type-def type-id='e375f1da' size-in-bits='32' hash='531124cd9d1b54e6#2' id='0dbd0b29'/>
-    <pointer-type-def type-id='8ae4e710' size-in-bits='32' hash='531124cd9d1b54e6#2' id='bd2b792c'/>
-    <pointer-type-def type-id='09e3e16a' size-in-bits='32' hash='531124cd9d1b54e6#2' id='51953752'/>
-    <pointer-type-def type-id='f44a3fa9' size-in-bits='32' hash='531124cd9d1b54e6#2' id='5f5d06cd'/>
-    <pointer-type-def type-id='02d5f98e' size-in-bits='32' hash='531124cd9d1b54e6#2' id='e3d72666'/>
-    <pointer-type-def type-id='8f0b7f5b' size-in-bits='32' hash='531124cd9d1b54e6#2' id='0f8d5f3d'/>
-    <pointer-type-def type-id='9454c681' size-in-bits='32' hash='531124cd9d1b54e6#2' id='7b6e1be7'/>
-    <pointer-type-def type-id='292a411c' size-in-bits='32' hash='531124cd9d1b54e6#2' id='1c93d4e6'/>
+    <pointer-type-def type-id='57a6462f' size-in-bits='32' hash='531124cd9d1b54e6' id='049544dc'/>
+    <pointer-type-def type-id='fb40bd2b' size-in-bits='32' hash='531124cd9d1b54e6' id='e1012f14'/>
+    <pointer-type-def type-id='6e8549d3' size-in-bits='32' hash='531124cd9d1b54e6' id='3e4a17a6'/>
+    <pointer-type-def type-id='383992fa' size-in-bits='32' hash='531124cd9d1b54e6' id='ac0692ef'/>
+    <pointer-type-def type-id='06e77920' size-in-bits='32' hash='531124cd9d1b54e6' id='930f7049'/>
+    <pointer-type-def type-id='e9587002' size-in-bits='32' hash='531124cd9d1b54e6' id='69e037a7'/>
+    <pointer-type-def type-id='4af7dbf9' size-in-bits='32' hash='531124cd9d1b54e6' id='0350b462'/>
+    <pointer-type-def type-id='d672c38b' size-in-bits='32' hash='531124cd9d1b54e6' id='a97276f8'/>
+    <pointer-type-def type-id='95f3d4f5' size-in-bits='32' hash='531124cd9d1b54e6' id='d8865276'/>
+    <pointer-type-def type-id='0a2a75cb' size-in-bits='32' hash='531124cd9d1b54e6' id='a5f29b60'/>
+    <pointer-type-def type-id='23550ab4' size-in-bits='32' hash='531124cd9d1b54e6' id='8a93d1c3'/>
+    <pointer-type-def type-id='cec64cc9' size-in-bits='32' hash='531124cd9d1b54e6' id='b9c24b8a'/>
+    <pointer-type-def type-id='ec1a15f3' size-in-bits='32' hash='531124cd9d1b54e6' id='571d8fb0'/>
+    <pointer-type-def type-id='7b12ad79' size-in-bits='32' hash='531124cd9d1b54e6' id='52583992'/>
     <pointer-type-def type-id='c8745fdc' size-in-bits='32' hash='2e1212d6a49eca34' id='c2fb5303'/>
-    <pointer-type-def type-id='f669f224' size-in-bits='32' hash='531124cd9d1b54e6' id='a5922fa3'/>
-    <pointer-type-def type-id='9da94b15' size-in-bits='32' hash='531124cd9d1b54e6' id='64c5934e'/>
-    <pointer-type-def type-id='2fe17cde' size-in-bits='32' hash='531124cd9d1b54e6' id='e475bf19'/>
-    <pointer-type-def type-id='2b6522f1' size-in-bits='32' hash='531124cd9d1b54e6' id='70351828'/>
-    <pointer-type-def type-id='d5b15e49' size-in-bits='32' hash='531124cd9d1b54e6' id='2365fdd8'/>
-    <pointer-type-def type-id='a77026dd' size-in-bits='32' hash='531124cd9d1b54e6' id='ccec23f4'/>
-    <pointer-type-def type-id='4c6da22e' size-in-bits='32' hash='531124cd9d1b54e6' id='7bbfad59'/>
-    <pointer-type-def type-id='54e064ca' size-in-bits='32' hash='531124cd9d1b54e6' id='89b4862b'/>
-    <pointer-type-def type-id='4aacf270' size-in-bits='32' hash='531124cd9d1b54e6' id='99ff6e15'/>
-    <pointer-type-def type-id='357daae3' size-in-bits='32' hash='531124cd9d1b54e6' id='0e7dc576'/>
-    <pointer-type-def type-id='ba3ff62b' size-in-bits='32' hash='531124cd9d1b54e6' id='c40ae374'/>
-    <pointer-type-def type-id='39763bbe' size-in-bits='32' hash='531124cd9d1b54e6' id='e8d65641'/>
-    <pointer-type-def type-id='655c526c' size-in-bits='32' hash='531124cd9d1b54e6' id='87683ec7'/>
-    <pointer-type-def type-id='392f372a' size-in-bits='32' hash='531124cd9d1b54e6' id='c8123d81'/>
-    <pointer-type-def type-id='2afd2d4d' size-in-bits='32' hash='531124cd9d1b54e6' id='5debed90'/>
-    <pointer-type-def type-id='93d80062' size-in-bits='32' hash='531124cd9d1b54e6' id='21976f65'/>
-    <pointer-type-def type-id='d24762a5' size-in-bits='32' hash='531124cd9d1b54e6' id='38711a82'/>
-    <pointer-type-def type-id='92fdb75f' size-in-bits='32' hash='531124cd9d1b54e6' id='ff005e88'/>
-    <pointer-type-def type-id='cc93eb66' size-in-bits='32' hash='531124cd9d1b54e6' id='4025b733'/>
-    <pointer-type-def type-id='cf650c06' size-in-bits='32' hash='531124cd9d1b54e6' id='9a5725d5'/>
-    <pointer-type-def type-id='f74edd67' size-in-bits='32' hash='531124cd9d1b54e6' id='ad0b765a'/>
-    <pointer-type-def type-id='bb3a3bd3' size-in-bits='32' hash='531124cd9d1b54e6' id='61b688b0'/>
-    <pointer-type-def type-id='b6c7f6ce' size-in-bits='32' hash='531124cd9d1b54e6' id='3f4a2861'/>
-    <pointer-type-def type-id='ccb79e1e' size-in-bits='32' hash='531124cd9d1b54e6#3' id='5cd6fe7f'/>
-    <pointer-type-def type-id='69749345' size-in-bits='32' hash='531124cd9d1b54e6#3' id='322ef220'/>
-    <pointer-type-def type-id='846957af' size-in-bits='32' hash='531124cd9d1b54e6#3' id='3b95ca3e'/>
-    <pointer-type-def type-id='ae98ce5e' size-in-bits='32' hash='531124cd9d1b54e6#3' id='34661db1'/>
-    <pointer-type-def type-id='8ae4e711' size-in-bits='32' hash='531124cd9d1b54e6#3' id='bd2b792a'/>
-    <pointer-type-def type-id='09e3e16b' size-in-bits='32' hash='531124cd9d1b54e6#3' id='51953750'/>
-    <pointer-type-def type-id='f44a3faa' size-in-bits='32' hash='531124cd9d1b54e6#3' id='5f5d06cb'/>
-    <pointer-type-def type-id='02d5f98f' size-in-bits='32' hash='531124cd9d1b54e6#3' id='e3d72664'/>
-    <pointer-type-def type-id='8f0b7f5c' size-in-bits='32' hash='531124cd9d1b54e6#3' id='0f8d5f3b'/>
-    <pointer-type-def type-id='9454c682' size-in-bits='32' hash='531124cd9d1b54e6#3' id='7b6e1be5'/>
-    <pointer-type-def type-id='292a411d' size-in-bits='32' hash='531124cd9d1b54e6#3' id='1c93d4e4'/>
+    <pointer-type-def type-id='a7e6cb13' size-in-bits='32' hash='531124cd9d1b54e6' id='a04487d0'/>
+    <pointer-type-def type-id='b8e7d066' size-in-bits='32' hash='531124cd9d1b54e6' id='2175e977'/>
+    <pointer-type-def type-id='7dcd5c56' size-in-bits='32' hash='531124cd9d1b54e6' id='84ed917f'/>
+    <pointer-type-def type-id='5b9f2a17' size-in-bits='32' hash='531124cd9d1b54e6' id='302207a0'/>
+    <pointer-type-def type-id='fd795a77' size-in-bits='32' hash='531124cd9d1b54e6' id='73cc2298'/>
+    <pointer-type-def type-id='662d0eb2' size-in-bits='32' hash='531124cd9d1b54e6' id='fda9c1a1'/>
+    <pointer-type-def type-id='6b863c78' size-in-bits='32' hash='531124cd9d1b54e6' id='fcfbd023'/>
+    <pointer-type-def type-id='c3c21033' size-in-bits='32' hash='531124cd9d1b54e6' id='d7458144'/>
+    <pointer-type-def type-id='a7c1621d' size-in-bits='32' hash='531124cd9d1b54e6' id='e4ddaae2'/>
+    <pointer-type-def type-id='acf0725f' size-in-bits='32' hash='531124cd9d1b54e6' id='e6deb706'/>
+    <pointer-type-def type-id='a3ff9453' size-in-bits='32' hash='531124cd9d1b54e6' id='f58e29c4'/>
+    <pointer-type-def type-id='61e5ab26' size-in-bits='32' hash='531124cd9d1b54e6' id='9c119f0f'/>
+    <pointer-type-def type-id='094bf2f4' size-in-bits='32' hash='531124cd9d1b54e6' id='2d40e32d'/>
+    <pointer-type-def type-id='9c073f92' size-in-bits='32' hash='531124cd9d1b54e6' id='3aa77c87'/>
+    <pointer-type-def type-id='5b4822f4' size-in-bits='32' hash='531124cd9d1b54e6' id='3155ce35'/>
+    <pointer-type-def type-id='a20c4677' size-in-bits='32' hash='531124cd9d1b54e6' id='de6ab93a'/>
+    <pointer-type-def type-id='d6ea8326' size-in-bits='32' hash='531124cd9d1b54e6' id='e4dd1d6b'/>
+    <pointer-type-def type-id='a383d12c' size-in-bits='32' hash='531124cd9d1b54e6' id='2e9f47d5'/>
+    <pointer-type-def type-id='a6436666' size-in-bits='32' hash='531124cd9d1b54e6' id='25d63ceb'/>
+    <pointer-type-def type-id='4c9e9276' size-in-bits='32' hash='531124cd9d1b54e6' id='e14e5747'/>
+    <pointer-type-def type-id='5757176d' size-in-bits='32' hash='531124cd9d1b54e6' id='394cbbe6'/>
+    <pointer-type-def type-id='9cc9dd7a' size-in-bits='32' hash='531124cd9d1b54e6' id='5b4efdbb'/>
+    <pointer-type-def type-id='33ac1a71' size-in-bits='32' hash='531124cd9d1b54e6' id='25acc26a'/>
+    <pointer-type-def type-id='9d128009' size-in-bits='32' hash='531124cd9d1b54e6' id='92632084'/>
+    <pointer-type-def type-id='f43373fc' size-in-bits='32' hash='531124cd9d1b54e6' id='7613d7f9'/>
+    <pointer-type-def type-id='df6ca4ba' size-in-bits='32' hash='531124cd9d1b54e6' id='6fa6efa3'/>
+    <pointer-type-def type-id='22c5fb1c' size-in-bits='32' hash='531124cd9d1b54e6' id='cb27a9e9'/>
+    <pointer-type-def type-id='6c854895' size-in-bits='32' hash='531124cd9d1b54e6' id='8243b832'/>
+    <pointer-type-def type-id='67e48e8f' size-in-bits='32' hash='531124cd9d1b54e6' id='6835b638'/>
+    <pointer-type-def type-id='22d0d33d' size-in-bits='32' hash='531124cd9d1b54e6' id='2e6fa23a'/>
+    <pointer-type-def type-id='928325e2' size-in-bits='32' hash='531124cd9d1b54e6' id='502b46a1'/>
+    <pointer-type-def type-id='4c5c6cc3' size-in-bits='32' hash='531124cd9d1b54e6' id='3792de44'/>
+    <pointer-type-def type-id='b869bd2d' size-in-bits='32' hash='531124cd9d1b54e6' id='e44a6fe2'/>
+    <pointer-type-def type-id='fddd9123' size-in-bits='32' hash='531124cd9d1b54e6' id='609456c4'/>
     <pointer-type-def type-id='9a10f134' size-in-bits='32' hash='c07f7064325de029' id='aa210e95'/>
-    <pointer-type-def type-id='31804c0e' size-in-bits='32' hash='531124cd9d1b54e6' id='8fb2e86b'/>
-    <pointer-type-def type-id='9dcf39b9' size-in-bits='32' hash='531124cd9d1b54e6' id='86d5bf12'/>
-    <pointer-type-def type-id='060737b9' size-in-bits='32' hash='531124cd9d1b54e6' id='d57c164e'/>
-    <pointer-type-def type-id='3ccdd9d3' size-in-bits='32' hash='531124cd9d1b54e6' id='1a7dde06'/>
-    <pointer-type-def type-id='bf8b79fb' size-in-bits='32' hash='531124cd9d1b54e6' id='a3339ebc'/>
-    <pointer-type-def type-id='a6863c16' size-in-bits='32' hash='531124cd9d1b54e6' id='b2c6c541'/>
-    <pointer-type-def type-id='e13d7981' size-in-bits='32' hash='531124cd9d1b54e6' id='a8a22fa6'/>
-    <pointer-type-def type-id='39763bbf' size-in-bits='32' hash='531124cd9d1b54e6#2' id='e8d65642'/>
+    <pointer-type-def type-id='6799fda7' size-in-bits='32' hash='531124cd9d1b54e6' id='54b2e682'/>
+    <pointer-type-def type-id='79d43c30' size-in-bits='32' hash='531124cd9d1b54e6' id='887705e9'/>
+    <pointer-type-def type-id='87f237ea' size-in-bits='32' hash='531124cd9d1b54e6' id='7dba8e29'/>
+    <pointer-type-def type-id='f6d3d312' size-in-bits='32' hash='531124cd9d1b54e6' id='79969dbf'/>
+    <pointer-type-def type-id='248d1bcc' size-in-bits='32' hash='531124cd9d1b54e6' id='64bd18fd'/>
+    <pointer-type-def type-id='48b0722b' size-in-bits='32' hash='531124cd9d1b54e6' id='242c266a'/>
+    <pointer-type-def type-id='ed82d8a8' size-in-bits='32' hash='531124cd9d1b54e6' id='ebe3c60d'/>
+    <pointer-type-def type-id='43c2ddeb' size-in-bits='32' hash='531124cd9d1b54e6' id='1d2b5c3c'/>
     <pointer-type-def type-id='a0eb0f09' size-in-bits='32' hash='361ee06d613da67d' id='b9c88d6a'/>
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='32' hash='a5a39a68720b1ee1' id='a68021ce'/>
     <pointer-type-def type-id='05d4c620' size-in-bits='32' hash='23eab9300da7c477' id='b8263143'/>
@@ -4350,68 +4350,68 @@ 
     <pointer-type-def type-id='f0981eed' size-in-bits='32' hash='dc0d3320f21be2df' id='807869d3'/>
     <pointer-type-def type-id='03e3ce24' size-in-bits='32' hash='531124cd9d1b54e6' id='e45dd401'/>
     <pointer-type-def type-id='a1159711' size-in-bits='32' hash='531124cd9d1b54e6' id='7a98879a'/>
-    <pointer-type-def type-id='d91da88b' size-in-bits='32' hash='531124cd9d1b54e6' id='bf254042'/>
-    <pointer-type-def type-id='44c9c9bf' size-in-bits='32' hash='531124cd9d1b54e6' id='191aba0c'/>
-    <pointer-type-def type-id='bf5f1f6d' size-in-bits='32' hash='531124cd9d1b54e6' id='f51198ec'/>
-    <pointer-type-def type-id='df741104' size-in-bits='32' hash='531124cd9d1b54e6' id='a46b0935'/>
-    <pointer-type-def type-id='a390bd39' size-in-bits='32' hash='531124cd9d1b54e6' id='34f80e06'/>
-    <pointer-type-def type-id='1529f4a1' size-in-bits='32' hash='531124cd9d1b54e6' id='81c03d6c'/>
-    <pointer-type-def type-id='33597c16' size-in-bits='32' hash='531124cd9d1b54e6' id='f7a0379f'/>
-    <pointer-type-def type-id='be7282a9' size-in-bits='32' hash='531124cd9d1b54e6' id='2b0e4ff2'/>
-    <pointer-type-def type-id='089c907d' size-in-bits='32' hash='531124cd9d1b54e6' id='e08d371c'/>
-    <pointer-type-def type-id='831ffd4a' size-in-bits='32' hash='531124cd9d1b54e6' id='545a856f'/>
-    <pointer-type-def type-id='3733befa' size-in-bits='32' hash='531124cd9d1b54e6' id='70ef270d'/>
-    <pointer-type-def type-id='0306f1a9' size-in-bits='32' hash='531124cd9d1b54e6' id='9bda8fea'/>
-    <pointer-type-def type-id='e65944cb' size-in-bits='32' hash='531124cd9d1b54e6' id='05b410f6'/>
-    <pointer-type-def type-id='bdd36586' size-in-bits='32' hash='531124cd9d1b54e6' id='7c24b203'/>
-    <pointer-type-def type-id='83901d9f' size-in-bits='32' hash='531124cd9d1b54e6' id='1171d1b4'/>
-    <pointer-type-def type-id='a8c3878a' size-in-bits='32' hash='531124cd9d1b54e6' id='625ca386'/>
-    <pointer-type-def type-id='a8c3878b' size-in-bits='32' hash='531124cd9d1b54e6#2' id='625ca387'/>
-    <pointer-type-def type-id='c06e176d' size-in-bits='32' hash='531124cd9d1b54e6' id='a479abce'/>
-    <pointer-type-def type-id='a8c3878c' size-in-bits='32' hash='531124cd9d1b54e6#3' id='625ca385'/>
-    <pointer-type-def type-id='f587884e' size-in-bits='32' hash='531124cd9d1b54e6' id='3d342907'/>
-    <pointer-type-def type-id='deb04b74' size-in-bits='32' hash='531124cd9d1b54e6' id='372c8441'/>
-    <pointer-type-def type-id='3d4aa27f' size-in-bits='32' hash='531124cd9d1b54e6' id='806c2c50'/>
-    <pointer-type-def type-id='980f5b1b' size-in-bits='32' hash='531124cd9d1b54e6' id='f1850b08'/>
-    <pointer-type-def type-id='a4bca08f' size-in-bits='32' hash='531124cd9d1b54e6' id='a733b71a'/>
-    <pointer-type-def type-id='c918d3fc' size-in-bits='32' hash='531124cd9d1b54e6' id='b251d72d'/>
-    <pointer-type-def type-id='741ec8cb' size-in-bits='32' hash='531124cd9d1b54e6' id='a522e978'/>
-    <pointer-type-def type-id='6b259141' size-in-bits='32' hash='531124cd9d1b54e6' id='950241b0'/>
-    <pointer-type-def type-id='394d7db8' size-in-bits='32' hash='531124cd9d1b54e6' id='21f41051'/>
-    <pointer-type-def type-id='86dac493' size-in-bits='32' hash='531124cd9d1b54e6' id='44f25f18'/>
-    <pointer-type-def type-id='e3c17b35' size-in-bits='32' hash='531124cd9d1b54e6' id='2ccb7754'/>
-    <pointer-type-def type-id='5e9ac5ac' size-in-bits='32' hash='531124cd9d1b54e6' id='792859dd'/>
-    <pointer-type-def type-id='8d96fcb9' size-in-bits='32' hash='531124cd9d1b54e6' id='b76b1db6'/>
-    <pointer-type-def type-id='71bbb5b1' size-in-bits='32' hash='531124cd9d1b54e6' id='c1bcf4ec'/>
-    <pointer-type-def type-id='65f72aae' size-in-bits='32' hash='531124cd9d1b54e6' id='1e124adf'/>
-    <pointer-type-def type-id='f82c684a' size-in-bits='32' hash='531124cd9d1b54e6' id='f34f71b5'/>
-    <pointer-type-def type-id='1b85d290' size-in-bits='32' hash='531124cd9d1b54e6' id='c003e813'/>
-    <pointer-type-def type-id='252732ae' size-in-bits='32' hash='531124cd9d1b54e6' id='49f4e2fd'/>
-    <pointer-type-def type-id='1408a281' size-in-bits='32' hash='531124cd9d1b54e6' id='3d23490c'/>
-    <pointer-type-def type-id='c5a9c037' size-in-bits='32' hash='531124cd9d1b54e6' id='368860b2'/>
-    <pointer-type-def type-id='f52cf650' size-in-bits='32' hash='531124cd9d1b54e6' id='931a74f1'/>
-    <pointer-type-def type-id='8f97eff0' size-in-bits='32' hash='531124cd9d1b54e6' id='fc76ab83'/>
-    <pointer-type-def type-id='3c76d9f1' size-in-bits='32' hash='531124cd9d1b54e6' id='0408c00e'/>
-    <pointer-type-def type-id='138fbb56' size-in-bits='32' hash='531124cd9d1b54e6' id='211caeb7'/>
-    <pointer-type-def type-id='0c71af8b' size-in-bits='32' hash='531124cd9d1b54e6' id='1135eb83'/>
-    <pointer-type-def type-id='0c71af8c' size-in-bits='32' hash='531124cd9d1b54e6#2' id='1135eb84'/>
-    <pointer-type-def type-id='a23173c4' size-in-bits='32' hash='531124cd9d1b54e6' id='68835375'/>
-    <pointer-type-def type-id='0c71af8d' size-in-bits='32' hash='531124cd9d1b54e6#3' id='1135eb82'/>
-    <pointer-type-def type-id='8791c9f1' size-in-bits='32' hash='531124cd9d1b54e6' id='4d8d0cb6'/>
-    <pointer-type-def type-id='69b156fb' size-in-bits='32' hash='531124cd9d1b54e6' id='a1f794fc'/>
-    <pointer-type-def type-id='570a4472' size-in-bits='32' hash='531124cd9d1b54e6' id='c0e9d857'/>
-    <pointer-type-def type-id='e123a5d8' size-in-bits='32' hash='531124cd9d1b54e6' id='9b7fadc5'/>
-    <pointer-type-def type-id='9edfc7bf' size-in-bits='32' hash='531124cd9d1b54e6' id='33caa8c4'/>
-    <pointer-type-def type-id='ba51789d' size-in-bits='32' hash='531124cd9d1b54e6' id='82203b3c'/>
-    <pointer-type-def type-id='b9e9f180' size-in-bits='32' hash='531124cd9d1b54e6' id='e1be4c89'/>
-    <pointer-type-def type-id='d80b7155' size-in-bits='32' hash='531124cd9d1b54e6' id='7c2a9d98'/>
-    <pointer-type-def type-id='3b2e054f' size-in-bits='32' hash='531124cd9d1b54e6' id='c05a64c8'/>
-    <pointer-type-def type-id='71686cf2' size-in-bits='32' hash='531124cd9d1b54e6' id='0c1914a7'/>
-    <pointer-type-def type-id='ada13aa2' size-in-bits='32' hash='531124cd9d1b54e6' id='bd3e8fb9'/>
-    <pointer-type-def type-id='f82c684b' size-in-bits='32' hash='531124cd9d1b54e6#2' id='f34f71b6'/>
+    <pointer-type-def type-id='0cd472f8' size-in-bits='32' hash='531124cd9d1b54e6' id='0caa0dcf'/>
+    <pointer-type-def type-id='4e1f6b96' size-in-bits='32' hash='531124cd9d1b54e6' id='4ba42953'/>
+    <pointer-type-def type-id='8573d780' size-in-bits='32' hash='531124cd9d1b54e6' id='9578bd3d'/>
+    <pointer-type-def type-id='f2cc4021' size-in-bits='32' hash='531124cd9d1b54e6' id='fcef0014'/>
+    <pointer-type-def type-id='e26e3bd8' size-in-bits='32' hash='531124cd9d1b54e6' id='c92c39bd'/>
+    <pointer-type-def type-id='86dd1fe0' size-in-bits='32' hash='531124cd9d1b54e6' id='963f4759'/>
+    <pointer-type-def type-id='dc96f34b' size-in-bits='32' hash='531124cd9d1b54e6' id='6c42c76e'/>
+    <pointer-type-def type-id='ceac3768' size-in-bits='32' hash='531124cd9d1b54e6' id='5721b4d5'/>
+    <pointer-type-def type-id='a6e6baa4' size-in-bits='32' hash='531124cd9d1b54e6' id='1b5bab1d'/>
+    <pointer-type-def type-id='e66af457' size-in-bits='32' hash='531124cd9d1b54e6' id='4c985d6a'/>
+    <pointer-type-def type-id='e8fe83e5' size-in-bits='32' hash='531124cd9d1b54e6' id='276cdb48'/>
+    <pointer-type-def type-id='24f572ff' size-in-bits='32' hash='531124cd9d1b54e6' id='cc949b48'/>
+    <pointer-type-def type-id='a71e7c19' size-in-bits='32' hash='531124cd9d1b54e6' id='13ff5ed6'/>
+    <pointer-type-def type-id='51300906' size-in-bits='32' hash='531124cd9d1b54e6' id='4effcdf5'/>
+    <pointer-type-def type-id='7a151c1f' size-in-bits='32' hash='531124cd9d1b54e6' id='033b4c5a'/>
+    <pointer-type-def type-id='b86fc20a' size-in-bits='32' hash='531124cd9d1b54e6' id='4cf405ef'/>
+    <pointer-type-def type-id='10902d5b' size-in-bits='32' hash='531124cd9d1b54e6' id='2ee87a2c'/>
+    <pointer-type-def type-id='ea89afa4' size-in-bits='32' hash='531124cd9d1b54e6' id='4e3962d3'/>
+    <pointer-type-def type-id='da94823b' size-in-bits='32' hash='531124cd9d1b54e6' id='f595227e'/>
+    <pointer-type-def type-id='80c98786' size-in-bits='32' hash='531124cd9d1b54e6' id='23df0f63'/>
+    <pointer-type-def type-id='e7aba88c' size-in-bits='32' hash='531124cd9d1b54e6' id='4ddca04d'/>
+    <pointer-type-def type-id='7a20f806' size-in-bits='32' hash='531124cd9d1b54e6' id='54ed3183'/>
+    <pointer-type-def type-id='b7cd64f0' size-in-bits='32' hash='531124cd9d1b54e6' id='349137e5'/>
+    <pointer-type-def type-id='a80582f4' size-in-bits='32' hash='531124cd9d1b54e6' id='bc788285'/>
+    <pointer-type-def type-id='ba2e5237' size-in-bits='32' hash='531124cd9d1b54e6' id='f0756a0a'/>
+    <pointer-type-def type-id='edc7b8e2' size-in-bits='32' hash='531124cd9d1b54e6' id='6a6a41af'/>
+    <pointer-type-def type-id='f4e4744c' size-in-bits='32' hash='531124cd9d1b54e6' id='47cf6701'/>
+    <pointer-type-def type-id='f516e505' size-in-bits='32' hash='531124cd9d1b54e6' id='d238e9f8'/>
+    <pointer-type-def type-id='164463c8' size-in-bits='32' hash='531124cd9d1b54e6' id='f0699eed'/>
+    <pointer-type-def type-id='f6f9f0e6' size-in-bits='32' hash='531124cd9d1b54e6' id='67616213'/>
+    <pointer-type-def type-id='fac128df' size-in-bits='32' hash='531124cd9d1b54e6' id='b903acea'/>
+    <pointer-type-def type-id='d845de08' size-in-bits='32' hash='531124cd9d1b54e6' id='27cc1a95'/>
+    <pointer-type-def type-id='30cb3c60' size-in-bits='32' hash='531124cd9d1b54e6' id='fa7b64f1'/>
+    <pointer-type-def type-id='46b19e4b' size-in-bits='32' hash='531124cd9d1b54e6' id='46cfa96e'/>
+    <pointer-type-def type-id='f849b055' size-in-bits='32' hash='531124cd9d1b54e6' id='dcb938f6'/>
+    <pointer-type-def type-id='93c36fbf' size-in-bits='32' hash='531124cd9d1b54e6' id='52490c64'/>
+    <pointer-type-def type-id='f253d299' size-in-bits='32' hash='531124cd9d1b54e6' id='cb345202'/>
+    <pointer-type-def type-id='80d65977' size-in-bits='32' hash='531124cd9d1b54e6' id='02597924'/>
+    <pointer-type-def type-id='61c30632' size-in-bits='32' hash='531124cd9d1b54e6' id='f9ae2915'/>
+    <pointer-type-def type-id='3f8e4f72' size-in-bits='32' hash='531124cd9d1b54e6' id='2f2ff64f'/>
+    <pointer-type-def type-id='b78bf66c' size-in-bits='32' hash='531124cd9d1b54e6' id='963c2d49'/>
+    <pointer-type-def type-id='fc103603' size-in-bits='32' hash='531124cd9d1b54e6' id='87524436'/>
+    <pointer-type-def type-id='841abdb4' size-in-bits='32' hash='531124cd9d1b54e6' id='03105c2f'/>
+    <pointer-type-def type-id='3a68af85' size-in-bits='32' hash='531124cd9d1b54e6' id='d2bd2fda'/>
+    <pointer-type-def type-id='d34f7a3e' size-in-bits='32' hash='531124cd9d1b54e6' id='fa4898ab'/>
+    <pointer-type-def type-id='9e8d40b9' size-in-bits='32' hash='531124cd9d1b54e6' id='93ed7c54'/>
+    <pointer-type-def type-id='18701924' size-in-bits='32' hash='531124cd9d1b54e6' id='8220f20b'/>
+    <pointer-type-def type-id='d7559c5d' size-in-bits='32' hash='531124cd9d1b54e6' id='9dfb2c96'/>
+    <pointer-type-def type-id='2675e377' size-in-bits='32' hash='531124cd9d1b54e6' id='46effcdc'/>
+    <pointer-type-def type-id='7ea2fde5' size-in-bits='32' hash='531124cd9d1b54e6' id='d88d0f96'/>
+    <pointer-type-def type-id='6cafc61e' size-in-bits='32' hash='531124cd9d1b54e6' id='57fbc9df'/>
+    <pointer-type-def type-id='7190707a' size-in-bits='32' hash='531124cd9d1b54e6' id='dd48378b'/>
+    <pointer-type-def type-id='7a913a2c' size-in-bits='32' hash='531124cd9d1b54e6' id='1167e98d'/>
+    <pointer-type-def type-id='e37e0e79' size-in-bits='32' hash='531124cd9d1b54e6' id='57269ef0'/>
+    <pointer-type-def type-id='3885d108' size-in-bits='32' hash='531124cd9d1b54e6' id='e00b6cf9'/>
+    <pointer-type-def type-id='d18e1298' size-in-bits='32' hash='531124cd9d1b54e6' id='7f5a3d5b'/>
+    <pointer-type-def type-id='328e96b3' size-in-bits='32' hash='531124cd9d1b54e6' id='d30f44a2'/>
+    <pointer-type-def type-id='a0602a8d' size-in-bits='32' hash='531124cd9d1b54e6' id='954e4e32'/>
+    <pointer-type-def type-id='e9b6e8c4' size-in-bits='32' hash='531124cd9d1b54e6' id='c2029967'/>
     <pointer-type-def type-id='30a82da4' size-in-bits='32' hash='531124cd9d1b54e6' id='c640490b'/>
-    <pointer-type-def type-id='8deca216' size-in-bits='32' hash='531124cd9d1b54e6' id='32c7d509'/>
-    <pointer-type-def type-id='b472b352' size-in-bits='32' hash='531124cd9d1b54e6' id='23103ee5'/>
+    <pointer-type-def type-id='6bc9dcad' size-in-bits='32' hash='531124cd9d1b54e6' id='a9defe9a'/>
+    <pointer-type-def type-id='e1e5221d' size-in-bits='32' hash='531124cd9d1b54e6' id='d4993206'/>
     <pointer-type-def type-id='c523b9f1' size-in-bits='32' hash='6e7ef355fec119f3' id='323d93c1'/>
     <pointer-type-def type-id='323d93c1' size-in-bits='32' hash='ba18e8dcb5e816cc' id='01efdaf1'/>
     <pointer-type-def type-id='aa12d1bd' size-in-bits='32' id='822cd80e'/>
@@ -10298,7 +10298,7 @@ 
       <parameter type-id='b59d7dce' filepath='frameworks/base/native/android/asset_manager.cpp' line='149' column='1'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-decl name='AAsset_seek' mangled-name='AAsset_seek' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_seek@@LIBANDROID' hash='4e5de69871656b20#2'>
+    <function-decl name='AAsset_seek' mangled-name='AAsset_seek' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_seek@@LIBANDROID' hash='4e5de69871656b20'>
       <parameter type-id='57d98aab' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1'/>
       <parameter type-id='ad707ada' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1'/>
       <parameter type-id='95e97e5e' filepath='frameworks/base/native/android/asset_manager.cpp' line='154' column='1'/>
@@ -10318,19 +10318,19 @@ 
       <parameter type-id='57d98aab' filepath='frameworks/base/native/android/asset_manager.cpp' line='170' column='1'/>
       <return type-id='eaa32e2f'/>
     </function-decl>
-    <function-decl name='AAsset_getLength' mangled-name='AAsset_getLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='175' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getLength@@LIBANDROID' hash='369bf6ce5c75f19#3'>
+    <function-decl name='AAsset_getLength' mangled-name='AAsset_getLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='175' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getLength@@LIBANDROID' hash='369bf6ce5c75f19'>
       <parameter type-id='57d98aab' filepath='frameworks/base/native/android/asset_manager.cpp' line='175' column='1'/>
       <return type-id='ad707ada'/>
     </function-decl>
-    <function-decl name='AAsset_getLength64' mangled-name='AAsset_getLength64' filepath='frameworks/base/native/android/asset_manager.cpp' line='180' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getLength64@@LIBANDROID' hash='ea08aa8832d3171d#2'>
+    <function-decl name='AAsset_getLength64' mangled-name='AAsset_getLength64' filepath='frameworks/base/native/android/asset_manager.cpp' line='180' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getLength64@@LIBANDROID' hash='ea08aa8832d3171d'>
       <parameter type-id='57d98aab' filepath='frameworks/base/native/android/asset_manager.cpp' line='180' column='1'/>
       <return type-id='05d4c620'/>
     </function-decl>
-    <function-decl name='AAsset_getRemainingLength' mangled-name='AAsset_getRemainingLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getRemainingLength@@LIBANDROID' hash='369bf6ce5c75f19#3'>
+    <function-decl name='AAsset_getRemainingLength' mangled-name='AAsset_getRemainingLength' filepath='frameworks/base/native/android/asset_manager.cpp' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getRemainingLength@@LIBANDROID' hash='369bf6ce5c75f19'>
       <parameter type-id='57d98aab' filepath='frameworks/base/native/android/asset_manager.cpp' line='175' column='1'/>
       <return type-id='ad707ada'/>
     </function-decl>
-    <function-decl name='AAsset_getRemainingLength64' mangled-name='AAsset_getRemainingLength64' filepath='frameworks/base/native/android/asset_manager.cpp' line='190' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getRemainingLength64@@LIBANDROID' hash='ea08aa8832d3171d#2'>
+    <function-decl name='AAsset_getRemainingLength64' mangled-name='AAsset_getRemainingLength64' filepath='frameworks/base/native/android/asset_manager.cpp' line='190' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AAsset_getRemainingLength64@@LIBANDROID' hash='ea08aa8832d3171d'>
       <parameter type-id='57d98aab' filepath='frameworks/base/native/android/asset_manager.cpp' line='180' column='1'/>
       <return type-id='05d4c620'/>
     </function-decl>
@@ -10369,13 +10369,13 @@ 
     <type-decl name='variadic parameter type' id='2c1145c5'/>
     <type-decl name='void' id='48b5725f'/>
     <pointer-type-def type-id='48b5725f' id='eaa32e2f'/>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='4693c583'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='9a362d2a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b7c7bab'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='80f4b756'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='6a9e3459'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='138afd90'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b7c7bab'/>
       <parameter type-id='d4a328b7'/>
@@ -10386,50 +10386,50 @@ 
       <parameter type-id='eaa32e2f'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='c2ab665d'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='e5bd5c7c'>
       <parameter type-id='fae49a1f'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='ca1de4b9'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='bfece280'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='70de5c42'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='6f7cb7b4'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='16c0590f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='9d54666b'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='64b352ce'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='eda358d5'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='a6eaa9f4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='fe376334'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='0224b00e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='2207a1d4'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='f0a16cf3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='ec86bf87'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='af1e5937'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10437,7 +10437,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='b3920ec1'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='58fcbf31'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10445,7 +10445,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='d44533d0'>
+    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='05c1e46f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10453,78 +10453,78 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='635e0a25'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='79acd688'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='161aeec2'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='ad6651c5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='40138048'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='906c7e7f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='f1f2c7f3'>
+    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='6f046d6d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='6a7bb135'>
+    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='86c14eea'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='96f3d089'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='1704c89a'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='44c6cc4b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='e825b06b'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='d4a328b7'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='72c33ddb'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='3fe1cc52'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='e825b06b'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='76032d71'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='dbabdcaf'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='47ca8d46'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='fe53f0ee'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='36acdbcc'>
+    <function-type size-in-bits='32' hash='cc5684f26e2d6bfd' id='ddb48714'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='c1b550c7'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='520e32ee'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='3c662e98'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='5b6b8457'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10532,7 +10532,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='8ae90496'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='7e2725d1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10540,7 +10540,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='d35f73d9'>
+    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='cbae85cf'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10548,72 +10548,72 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='d6f3cc1e'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='34294ba8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='521af3a9'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='5131b3e5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='4aa4e453'>
+    <function-type size-in-bits='32' hash='56df0a0ce1105618' id='baa6c01f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='b062a33a'>
+    <function-type size-in-bits='32' hash='a2f45a0b35e4c3ac' id='adbcd94d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='c6492f6c'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='51c807eb'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='61dc2b35'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='a6979e77'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='23a084d1'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='10d8a2b2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='61dc2b35'/>
     </function-type>
-    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='1c231d7d'>
+    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='a7f7fff9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='c60ec5ea'>
+    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='ac63458c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='63e40290'>
+    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='6c0ad14a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='b58a040b'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='c648ecac'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='c71e554c'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='0d5e3ea5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10621,7 +10621,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='48a0988a'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='2d81735f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10629,7 +10629,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='f7dd8e730721e00e' id='4543f86d'>
+    <function-type size-in-bits='32' hash='f7dd8e730721e00e' id='1642288d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10637,50 +10637,50 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='024b2e02'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='9a879f12'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='72b5ef45'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='1b9d7d93'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='4d6cc7ff'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='229ae47d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='f7dd8e730721e00e' id='171c33c6'>
+    <function-type size-in-bits='32' hash='f7dd8e730721e00e' id='0681baf3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='062cf4ec'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='68768207'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='088b642f'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='071e4e5d'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='2362799b'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='fec334c0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='088b642f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='e7767992'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='4962a6a9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='80f4b756'/>
       <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' hash='b6d18584d7e12ba7' id='6b5969a6'>
+    <function-type size-in-bits='32' hash='b6d18584d7e12ba7' id='9096ef22'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='80f4b756'/>
       <parameter type-id='96f3d089'/>
@@ -10688,44 +10688,44 @@ 
       <parameter type-id='2c2f1adb'/>
       <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='41d77b1c'>
+    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='0c0fb02e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='541d431d'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='ee9f7f1d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='70de5c42'/>
     </function-type>
-    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='0fbe2cda'>
+    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='daa62f6c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='1ce8356d'>
+    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='fbd11c11'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='0257c247'>
+    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='41d3ee1b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92' id='9f8e2b3e'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='da5f3921'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92' id='5c9d1bb1'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='c76018ba'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10733,7 +10733,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92' id='7cc5073b'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='8e8d8560'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10741,7 +10741,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='241e57ed4ca36c82' id='f6f688b2'>
+    <function-type size-in-bits='32' hash='241e57ed4ca36c82' id='462faf42'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10749,84 +10749,84 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92' id='9ee61f63'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='50461049'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92' id='47aa8c3c'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='7c6bd1bc'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92' id='6b33627a'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='beb693fa'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='241e57ed4ca36c82' id='039aab3d'>
+    <function-type size-in-bits='32' hash='241e57ed4ca36c82' id='353c555c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='1b2606fc'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='486b9cd1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='feee141c'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='6292c81e'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='b5b9ed34'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='2c73abfd'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='feee141c'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='74c6e66d'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='daecdf3d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='80f4b756'/>
       <parameter type-id='80f4b756'/>
       <return type-id='1f3810cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='18f35374'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='7f3fc66e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='1f3810cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='3ed49d13'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='08e81539'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='c3f30acc'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='d0f1dd4c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='2baaba0a'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='41c4608a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='2e36b4ed'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='c3775dec'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='14209476'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='51d11665'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10834,7 +10834,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='06dcb13c'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='4c8d769f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10842,7 +10842,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='672db497'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='df8fe3cd'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10850,109 +10850,109 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='7f8c4cf0'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='f9633a52'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='28a5f5af'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a5560353'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='89a65589'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='df291ebd'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='94426c08'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='6732ad33'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='1c8e3a5a'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='aab7be53'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='6e9854cd'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='d8263a65'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='5321e7f1'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='9decd400'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='6e9854cd'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='f68d4a05'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='cb7ec8b5'>
       <parameter type-id='fae49a1f'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='2fb8ba3e'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='192148ae'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='17ed04c8'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='b02c2550'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='185cc89b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='eb909c09'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='b15a7c4e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='8ec52105'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='46353f35'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='bc2d56ac'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='80f4b756'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='ccb79e1c'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='252d62f6'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='69749343'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='53da899f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='846957ad'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='db26a379'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='ae98ce5c'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='f0f9a897'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='49080c66'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='1f063e10'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6#2' id='e375f1d9'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='8d218ff2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='8ae4e70f'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='4b346528'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10960,7 +10960,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='09e3e169'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='9d003166'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10968,7 +10968,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='f44a3fa8'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='a8a6d650'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -10976,82 +10976,82 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='02d5f98d'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='92f89d93'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='8f0b7f5a'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='aa58d93a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='9454c680'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='280b89e0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='292a411b'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='a613f7c2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='1461dd30'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='a976ad33'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b89f496'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='3aff0b18'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='57a6462f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='181f4ac0'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='7f83e8c4'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='7343f038'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='fb40bd2b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='181f4ac0'/>
     </function-type>
-    <function-type size-in-bits='32' hash='ea08aa8832d3171d#2' id='ccb79e1d'>
+    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='6e8549d3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='ea08aa8832d3171d#2' id='69749344'>
+    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='383992fa'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='ea08aa8832d3171d#2' id='846957ae'>
+    <function-type size-in-bits='32' hash='ea08aa8832d3171d' id='06e77920'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92#2' id='ae98ce5d'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='e9587002'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92#3' id='e375f1da'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='4af7dbf9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92#2' id='8ae4e710'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='d672c38b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11059,7 +11059,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92#2' id='09e3e16a'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='95f3d4f5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11067,7 +11067,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='241e57ed4ca36c82#2' id='f44a3fa9'>
+    <function-type size-in-bits='32' hash='241e57ed4ca36c82' id='0a2a75cb'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11075,108 +11075,108 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92#2' id='02d5f98e'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='23550ab4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92#2' id='8f0b7f5b'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='cec64cc9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='609286cc9c472e92#2' id='9454c681'>
+    <function-type size-in-bits='32' hash='609286cc9c472e92' id='ec1a15f3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='241e57ed4ca36c82#2' id='292a411c'>
+    <function-type size-in-bits='32' hash='241e57ed4ca36c82' id='7b12ad79'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='f669f224'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a7e6cb13'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='b43b1271'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='c2fb5303'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='9da94b15'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='b8e7d066'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='b43b1271'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='2fe17cde'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='7dcd5c56'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='80f4b756'/>
       <parameter type-id='80f4b756'/>
       <return type-id='38565182'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='2b6522f1'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='5b9f2a17'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='38565182'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='d5b15e49'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='fd795a77'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='a77026dd'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='662d0eb2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='7deb416bd728693c' id='4c6da22e'>
+    <function-type size-in-bits='32' hash='7deb416bd728693c' id='6b863c78'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='cc6e09ca'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='54e064ca'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='c3c21033'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='4aacf270'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='a7c1621d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='7deb416bd728693c' id='357daae3'>
+    <function-type size-in-bits='32' hash='7deb416bd728693c' id='acf0725f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='cc6e09ca'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='ba3ff62b'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a3ff9453'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='39763bbe'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='61e5ab26'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='655c526c'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='094bf2f4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11184,7 +11184,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='392f372a'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='9c073f92'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11192,7 +11192,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='2afd2d4d'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='5b4822f4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11200,85 +11200,85 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='93d80062'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a20c4677'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='d24762a5'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='d6ea8326'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='92fdb75f'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a383d12c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='cc93eb66'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='a6436666'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='cf650c06'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='4c9e9276'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2d5e6f72'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='b2091f1913f48b95' id='f74edd67'>
+    <function-type size-in-bits='32' hash='b2091f1913f48b95' id='5757176d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='c8745fdc'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='bb3a3bd3'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='9cc9dd7a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='96f3d089'/>
       <return type-id='2d5e6f72'/>
     </function-type>
-    <function-type size-in-bits='32' hash='adf72316744a47e2' id='b6c7f6ce'>
+    <function-type size-in-bits='32' hash='adf72316744a47e2' id='33ac1a71'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='c36bf49e'/>
     </function-type>
-    <function-type size-in-bits='32' hash='e3cd00ed468e2211#3' id='ccb79e1e'>
+    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='9d128009'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='e3cd00ed468e2211#3' id='69749345'>
+    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='f43373fc'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='e3cd00ed468e2211#3' id='846957af'>
+    <function-type size-in-bits='32' hash='e3cd00ed468e2211' id='df6ca4ba'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b#3' id='ae98ce5e'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='22c5fb1c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b#3' id='8ae4e711'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='6c854895'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11286,7 +11286,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b#3' id='09e3e16b'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='67e48e8f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11294,7 +11294,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='f7dd8e730721e00e#3' id='f44a3faa'>
+    <function-type size-in-bits='32' hash='f7dd8e730721e00e' id='22d0d33d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11302,70 +11302,70 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b#3' id='02d5f98f'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='928325e2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b#3' id='8f0b7f5c'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='4c5c6cc3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='650e02aa6aee9d8b#3' id='9454c682'>
+    <function-type size-in-bits='32' hash='650e02aa6aee9d8b' id='b869bd2d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='f7dd8e730721e00e#3' id='292a411d'>
+    <function-type size-in-bits='32' hash='f7dd8e730721e00e' id='fddd9123'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='31804c0e'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='6799fda7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='152bf3a9'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='aa210e95'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='9dcf39b9'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='79d43c30'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='152bf3a9'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='060737b9'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='87f237ea'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='65b69bb3'/>
       <return type-id='2c2f1adb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='3ccdd9d3'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='f6d3d312'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b7c7bab'/>
       <return type-id='2c2f1adb'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='bf8b79fb'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='248d1bcc'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='80f4b756'/>
       <return type-id='5b7c7bab'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a6863c16'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='48b0722b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='3b4676f4'/>
       <parameter type-id='2c2f1adb'/>
       <return type-id='5b7c7bab'/>
     </function-type>
-    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='e13d7981'>
+    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='ed82d8a8'>
       <parameter type-id='fae49a1f'/>
       <return type-id='5b89f496'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6#2' id='39763bbf'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='43c2ddeb'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='6c9a8402'/>
@@ -11379,21 +11379,21 @@ 
       <parameter type-id='80f4b756'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='d91da88b'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='0cd472f8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='65b69bb3'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='44c9c9bf'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='4e1f6b96'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='e825b06b'/>
       <parameter type-id='d4a328b7'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='bf5f1f6d'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='8573d780'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='e825b06b'/>
       <parameter type-id='2c2f1adb'/>
@@ -11401,7 +11401,7 @@ 
       <parameter type-id='067e0250'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='df741104'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='f2cc4021'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='e825b06b'/>
       <parameter type-id='2c2f1adb'/>
@@ -11409,14 +11409,14 @@ 
       <parameter type-id='d4a328b7'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a390bd39'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='e26e3bd8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='61dc2b35'/>
       <parameter type-id='a6979e77'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='1529f4a1'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='86dd1fe0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='61dc2b35'/>
       <parameter type-id='2c2f1adb'/>
@@ -11424,7 +11424,7 @@ 
       <parameter type-id='a8d5bec6'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='33597c16'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='dc96f34b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='61dc2b35'/>
       <parameter type-id='2c2f1adb'/>
@@ -11432,14 +11432,14 @@ 
       <parameter type-id='a6979e77'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='be7282a9'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='ceac3768'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='088b642f'/>
       <parameter type-id='071e4e5d'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='089c907d'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='a6e6baa4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='088b642f'/>
       <parameter type-id='2c2f1adb'/>
@@ -11447,7 +11447,7 @@ 
       <parameter type-id='3b4676f4'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='831ffd4a'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='e66af457'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='088b642f'/>
       <parameter type-id='2c2f1adb'/>
@@ -11455,98 +11455,98 @@ 
       <parameter type-id='071e4e5d'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='67218bc19b4303f1' id='3733befa'>
+    <function-type size-in-bits='32' hash='67218bc19b4303f1' id='e8fe83e5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='cc6e09ca'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='67218bc19b4303f1' id='0306f1a9'>
+    <function-type size-in-bits='32' hash='67218bc19b4303f1' id='24f572ff'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='adf18958'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='69f869dac55786cc' id='e65944cb'>
+    <function-type size-in-bits='32' hash='69f869dac55786cc' id='a71e7c19'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='8dfe2e06'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='c717d391a2b5115f' id='bdd36586'>
+    <function-type size-in-bits='32' hash='c717d391a2b5115f' id='51300906'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='973e3c3f'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='83901d9f'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='7a151c1f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='1a7fe6b0'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='a8c3878a'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='b86fc20a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='c717d391a2b5115f#2' id='a8c3878b'>
+    <function-type size-in-bits='32' hash='c717d391a2b5115f' id='10902d5b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='c8745fdc'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='c06e176d'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='ea89afa4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='96f3d089'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='69f869dac55786cc#3' id='a8c3878c'>
+    <function-type size-in-bits='32' hash='69f869dac55786cc' id='da94823b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='9a10f134'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='f587884e'>
+    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='80c98786'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='deb04b74'>
+    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='e7aba88c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='3d4aa27f'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='7a20f806'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c42'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='980f5b1b'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='b7cd64f0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='feee141c'/>
       <parameter type-id='6292c81e'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='a4bca08f'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='a80582f4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='feee141c'/>
       <parameter type-id='2c2f1adb'/>
@@ -11554,7 +11554,7 @@ 
       <parameter type-id='c5b6437f'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='c918d3fc'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='ba2e5237'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='feee141c'/>
       <parameter type-id='2c2f1adb'/>
@@ -11562,14 +11562,14 @@ 
       <parameter type-id='6292c81e'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='741ec8cb'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='edc7b8e2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='6e9854cd'/>
       <parameter type-id='d8263a65'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='6b259141'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='f4e4744c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='6e9854cd'/>
       <parameter type-id='2c2f1adb'/>
@@ -11577,7 +11577,7 @@ 
       <parameter type-id='640aedbe'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='394d7db8'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='f516e505'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='6e9854cd'/>
       <parameter type-id='2c2f1adb'/>
@@ -11585,14 +11585,14 @@ 
       <parameter type-id='d8263a65'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='86dac493'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='164463c8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='181f4ac0'/>
       <parameter type-id='7f83e8c4'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='e3c17b35'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='f6f9f0e6'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='181f4ac0'/>
       <parameter type-id='2c2f1adb'/>
@@ -11600,7 +11600,7 @@ 
       <parameter type-id='3c8ecc03'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='5e9ac5ac'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='fac128df'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='181f4ac0'/>
       <parameter type-id='2c2f1adb'/>
@@ -11608,14 +11608,14 @@ 
       <parameter type-id='7f83e8c4'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='8d96fcb9'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='d845de08'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='b43b1271'/>
       <parameter type-id='c2fb5303'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='71bbb5b1'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='30cb3c60'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='b43b1271'/>
       <parameter type-id='2c2f1adb'/>
@@ -11623,7 +11623,7 @@ 
       <parameter type-id='884af3d2'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='65f72aae'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='46b19e4b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='b43b1271'/>
       <parameter type-id='2c2f1adb'/>
@@ -11631,12 +11631,12 @@ 
       <parameter type-id='c2fb5303'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='f82c684a'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='f849b055'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='1b85d290'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='93c36fbf'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11644,7 +11644,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='252732ae'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='f253d299'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11652,7 +11652,7 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='1408a281'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='80d65977'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c42'/>
@@ -11660,105 +11660,105 @@ 
       <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='7deb416bd728693c' id='c5a9c037'>
+    <function-type size-in-bits='32' hash='7deb416bd728693c' id='61c30632'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='cc6e09ca'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='7deb416bd728693c' id='f52cf650'>
+    <function-type size-in-bits='32' hash='7deb416bd728693c' id='3f8e4f72'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='adf18958'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='85066789d9950bf5' id='8f97eff0'>
+    <function-type size-in-bits='32' hash='85066789d9950bf5' id='b78bf66c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='8dfe2e06'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='b2091f1913f48b95' id='3c76d9f1'>
+    <function-type size-in-bits='32' hash='b2091f1913f48b95' id='fc103603'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='973e3c3f'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='138fbb56'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='841abdb4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='1a7fe6b0'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='0c71af8b'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='3a68af85'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='b2091f1913f48b95#2' id='0c71af8c'>
+    <function-type size-in-bits='32' hash='b2091f1913f48b95' id='d34f7a3e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='c8745fdc'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='a23173c4'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='9e8d40b9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='96f3d089'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='85066789d9950bf5#3' id='0c71af8d'>
+    <function-type size-in-bits='32' hash='85066789d9950bf5' id='18701924'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='1f3810cb'/>
       <parameter type-id='9a10f134'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='8791c9f1'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='d7559c5d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='69b156fb'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='2675e377'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='570a4472'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='7ea2fde5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565182'/>
       <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='e123a5d8'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='6cafc61e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='2d5e6f72'/>
       <parameter type-id='2c2f1adb'/>
       <parameter type-id='96f3d089'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='9edfc7bf'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='7190707a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='152bf3a9'/>
       <parameter type-id='aa210e95'/>
       <parameter type-id='0b9c02cb'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='ba51789d'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='7a913a2c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='152bf3a9'/>
       <parameter type-id='2c2f1adb'/>
@@ -11766,7 +11766,7 @@ 
       <parameter type-id='69d41a4a'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='b9e9f180'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='e37e0e79'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='152bf3a9'/>
       <parameter type-id='2c2f1adb'/>
@@ -11774,19 +11774,19 @@ 
       <parameter type-id='aa210e95'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='d80b7155'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='3885d108'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b7c7bab'/>
       <parameter type-id='80f4b756'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='3b2e054f'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='d18e1298'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b7c7bab'/>
       <parameter type-id='3b4676f4'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='71686cf2'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='328e96b3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b7c7bab'/>
       <parameter type-id='2c2f1adb'/>
@@ -11794,7 +11794,7 @@ 
       <parameter type-id='26a90f95'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='4e5de69871656b20' id='ada13aa2'>
+    <function-type size-in-bits='32' hash='4e5de69871656b20' id='a0602a8d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='5b7c7bab'/>
       <parameter type-id='2c2f1adb'/>
@@ -11802,18 +11802,18 @@ 
       <parameter type-id='071e4e5d'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19#2' id='f82c684b'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='e9b6e8c4'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='6c9a8402'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='8deca216'>
+    <function-type size-in-bits='32' hash='125a6717dec0b9d6' id='6bc9dcad'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='65b69bb3'/>
       <parameter type-id='d4a328b7'/>
       <return type-id='eaa32e2f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='b472b352'>
+    <function-type size-in-bits='32' hash='369bf6ce5c75f19' id='e1e5221d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <return type-id='eaa32e2f'/>
@@ -11826,7 +11826,7 @@ 
       </data-member>
     </class-decl>
     <typedef-decl name='AChoreographer_frameCallback' type-id='4382769c' size-in-bits='32' filepath='frameworks/native/include/android/choreographer.h' line='45' column='1' hash='f0c050c6f9f8032e' id='f687fd19'/>
-    <typedef-decl name='AChoreographer_frameCallback64' type-id='4382769d' size-in-bits='32' filepath='frameworks/native/include/android/choreographer.h' line='55' column='1' hash='f0c050c6f9f8032e' id='acccec6b'/>
+    <typedef-decl name='AChoreographer_frameCallback64' type-id='fbdae219' size-in-bits='32' filepath='frameworks/native/include/android/choreographer.h' line='55' column='1' hash='f0c050c6f9f8032e' id='acccec6b'/>
     <typedef-decl name='__uint64_t' type-id='f0981eeb' size-in-bits='64' filepath='bionic/libc/include/stdint.h' line='47' column='1' hash='61477c4d1fd8d94d' id='8910171f'/>
     <typedef-decl name='imaxdiv_t' type-id='e7f43f7b' size-in-bits='32' filepath='bionic/libc/include/inttypes.h' line='255' column='1' hash='f0c050c6f9f8032e' id='5c0b4dc9'/>
     <typedef-decl name='intmax_t' type-id='9da381c4' size-in-bits='64' filepath='bionic/libc/include/stdint.h' line='104' column='1' hash='61477c4d1fd8d94d' id='e104d842'/>
@@ -11965,8 +11965,8 @@ 
     <reference-type-def kind='rvalue' type-id='1509eddc' size-in-bits='32' hash='a52753d9d9db6b6e#13' id='82acecce'/>
     <pointer-type-def type-id='1509eddc' size-in-bits='32' hash='e5b9c7c26bd21d7f#5' id='e8fa2672'/>
     <pointer-type-def type-id='e7f43f7b' size-in-bits='32' hash='51a7f6f03a9ca51a' id='8567d8b0'/>
-    <pointer-type-def type-id='7b5ced03' size-in-bits='32' hash='531124cd9d1b54e6' id='4382769d'/>
-    <pointer-type-def type-id='7b5ced04' size-in-bits='32' hash='531124cd9d1b54e6#2' id='4382769c'/>
+    <pointer-type-def type-id='d28b048e' size-in-bits='32' hash='531124cd9d1b54e6' id='fbdae219'/>
+    <pointer-type-def type-id='7b5ced03' size-in-bits='32' hash='531124cd9d1b54e6' id='4382769c'/>
     <pointer-type-def type-id='eaa32e2f' size-in-bits='32' hash='453a8302a4a5da9b' id='63e171df'/>
     <pointer-type-def type-id='7b0c0278' size-in-bits='32' id='136b85b5'/>
     <pointer-type-def type-id='aa12d1be' size-in-bits='32' id='822cd80f'/>
@@ -12474,7 +12474,7 @@ 
       <parameter type-id='95e97e5f' filepath='frameworks/base/native/android/choreographer.cpp' line='212' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='AChoreographer_postFrameCallback64' mangled-name='AChoreographer_postFrameCallback64' filepath='frameworks/base/native/android/choreographer.cpp' line='216' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AChoreographer_postFrameCallback64@@LIBANDROID' hash='c8041b3a5ceebe4b#2'>
+    <function-decl name='AChoreographer_postFrameCallback64' mangled-name='AChoreographer_postFrameCallback64' filepath='frameworks/base/native/android/choreographer.cpp' line='216' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AChoreographer_postFrameCallback64@@LIBANDROID' hash='c8041b3a5ceebe4b'>
       <parameter type-id='136b85b5' filepath='frameworks/base/native/android/choreographer.cpp' line='216' column='1'/>
       <parameter type-id='acccec6b' filepath='frameworks/base/native/android/choreographer.cpp' line='217' column='1'/>
       <parameter type-id='eaa32e2f' filepath='frameworks/base/native/android/choreographer.cpp' line='217' column='1'/>
@@ -12488,12 +12488,12 @@ 
       <return type-id='48b5725f'/>
     </function-decl>
     <typedef-decl name='AChoreographer' type-id='d1af9805' filepath='frameworks/native/include/android/choreographer.h' line='35' column='1' id='7b0c0278'/>
-    <function-type size-in-bits='32' hash='44e39fef68e0fa91' id='7b5ced03'>
+    <function-type size-in-bits='32' hash='44e39fef68e0fa91' id='d28b048e'>
       <parameter type-id='9da381c4'/>
       <parameter type-id='eaa32e2f'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b#2' id='7b5ced04'>
+    <function-type size-in-bits='32' hash='c8041b3a5ceebe4b' id='7b5ced03'>
       <parameter type-id='95e97e5f'/>
       <parameter type-id='eaa32e2f'/>
       <return type-id='48b5725f'/>
@@ -12957,11 +12957,11 @@ 
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AKeyEvent_getDownTime' mangled-name='AKeyEvent_getDownTime' filepath='frameworks/base/native/android/input.cpp' line='76' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getDownTime@@LIBANDROID' hash='44e39fef68e0fa91#2'>
+    <function-decl name='AKeyEvent_getDownTime' mangled-name='AKeyEvent_getDownTime' filepath='frameworks/base/native/android/input.cpp' line='76' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getDownTime@@LIBANDROID' hash='44e39fef68e0fa91'>
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
-    <function-decl name='AKeyEvent_getEventTime' mangled-name='AKeyEvent_getEventTime' filepath='frameworks/base/native/android/input.cpp' line='81' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getEventTime@@LIBANDROID' hash='44e39fef68e0fa91#2'>
+    <function-decl name='AKeyEvent_getEventTime' mangled-name='AKeyEvent_getEventTime' filepath='frameworks/base/native/android/input.cpp' line='81' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AKeyEvent_getEventTime@@LIBANDROID' hash='44e39fef68e0fa91'>
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
@@ -12985,11 +12985,11 @@ 
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='41' column='1'/>
       <return type-id='3ff5601b'/>
     </function-decl>
-    <function-decl name='AMotionEvent_getDownTime' mangled-name='AMotionEvent_getDownTime' filepath='frameworks/base/native/android/input.cpp' line='105' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getDownTime@@LIBANDROID' hash='44e39fef68e0fa91#2'>
+    <function-decl name='AMotionEvent_getDownTime' mangled-name='AMotionEvent_getDownTime' filepath='frameworks/base/native/android/input.cpp' line='105' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getDownTime@@LIBANDROID' hash='44e39fef68e0fa91'>
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
-    <function-decl name='AMotionEvent_getEventTime' mangled-name='AMotionEvent_getEventTime' filepath='frameworks/base/native/android/input.cpp' line='109' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getEventTime@@LIBANDROID' hash='44e39fef68e0fa91#2'>
+    <function-decl name='AMotionEvent_getEventTime' mangled-name='AMotionEvent_getEventTime' filepath='frameworks/base/native/android/input.cpp' line='109' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getEventTime@@LIBANDROID' hash='44e39fef68e0fa91'>
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='76' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
@@ -13088,7 +13088,7 @@ 
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='129' column='1'/>
       <return type-id='b59d7dce'/>
     </function-decl>
-    <function-decl name='AMotionEvent_getHistoricalEventTime' mangled-name='AMotionEvent_getHistoricalEventTime' filepath='frameworks/base/native/android/input.cpp' line='194' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalEventTime@@LIBANDROID' hash='ea08aa8832d3171d#2'>
+    <function-decl name='AMotionEvent_getHistoricalEventTime' mangled-name='AMotionEvent_getHistoricalEventTime' filepath='frameworks/base/native/android/input.cpp' line='194' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AMotionEvent_getHistoricalEventTime@@LIBANDROID' hash='ea08aa8832d3171d'>
       <parameter type-id='a7e09f2f' filepath='frameworks/base/native/android/input.cpp' line='194' column='1'/>
       <parameter type-id='b59d7dce' filepath='frameworks/base/native/android/input.cpp' line='195' column='1'/>
       <return type-id='9da381c4'/>
@@ -13310,7 +13310,7 @@ 
       <parameter type-id='37fc1695' filepath='frameworks/base/native/android/native_activity.cpp' line='24' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='ANativeActivity_setWindowFormat' mangled-name='ANativeActivity_setWindowFormat' filepath='frameworks/base/native/android/native_activity.cpp' line='28' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeActivity_setWindowFormat@@LIBANDROID' hash='c8041b3a5ceebe4b#2'>
+    <function-decl name='ANativeActivity_setWindowFormat' mangled-name='ANativeActivity_setWindowFormat' filepath='frameworks/base/native/android/native_activity.cpp' line='28' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ANativeActivity_setWindowFormat@@LIBANDROID' hash='c8041b3a5ceebe4b'>
       <parameter type-id='37fc1695' filepath='frameworks/base/native/android/native_activity.cpp' line='28' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/base/native/android/native_activity.cpp' line='28' column='1'/>
       <return type-id='48b5725f'/>
@@ -14373,7 +14373,7 @@ 
     <typedef-decl name='jmethodID' type-id='b09bab5f' size-in-bits='32' filepath='libnativehelper/include_jni/jni.h' line='105' column='1' id='38565183'/>
     <typedef-decl name='jvalue' type-id='2eab072c' filepath='libnativehelper/include_jni/jni.h' line='119' column='1' id='0994533c'/>
     <typedef-decl name='JavaVM' type-id='d607ede0' filepath='libnativehelper/include_jni/jni.h' line='140' column='1' id='ebc81182'/>
-    <function-decl name='ashmem_create_region' filepath='system/core/libcutils/include/cutils/ashmem.h' line='30' column='1' visibility='default' binding='global' size-in-bits='32' hash='125a6717dec0b9d6#2'>
+    <function-decl name='ashmem_create_region' filepath='system/core/libcutils/include/cutils/ashmem.h' line='30' column='1' visibility='default' binding='global' size-in-bits='32' hash='125a6717dec0b9d6'>
       <parameter type-id='80f4b756'/>
       <parameter type-id='f0981eed'/>
       <return type-id='95e97e5e'/>
@@ -16791,7 +16791,7 @@ 
     <qualified-type-def type-id='807869d4' const='yes' hash='3ca8ed4d3b88ff0b' id='de9ce8e8'/>
     <reference-type-def kind='lvalue' type-id='de9ce8e8' size-in-bits='32' hash='7923a085b5463a0a' id='3f027c4a'/>
     <reference-type-def kind='lvalue' type-id='807869d4' size-in-bits='32' hash='72b9d318ef20240e' id='328eccaf'/>
-    <pointer-type-def type-id='8cf25b48' size-in-bits='32' hash='531124cd9d1b54e6' id='f11d61bd'/>
+    <pointer-type-def type-id='9a6f82c8' size-in-bits='32' hash='531124cd9d1b54e6' id='9b84c6cd'/>
     <pointer-type-def type-id='ba286cd1' size-in-bits='32' hash='531124cd9d1b54e6' id='336b85fe'/>
     <reference-type-def kind='lvalue' type-id='eaa32e2f' size-in-bits='32' hash='cb341c7c7788d1ba' id='67e1782b'/>
     <reference-type-def kind='rvalue' type-id='eaa32e2f' size-in-bits='32' hash='c7f97a22fbdaf4be' id='94effc77'/>
@@ -17041,7 +17041,7 @@ 
       </class-decl>
       <class-decl name='Parcel' visibility='default' size-in-bits='480' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='55' column='1' hash='bde40379817a2762' id='cb49a619'>
         <member-type access='private'>
-          <typedef-decl name='release_func' type-id='f11d61bd' size-in-bits='32' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='482' column='1' hash='f0c050c6f9f8032e' id='154ab60a'/>
+          <typedef-decl name='release_func' type-id='9b84c6cd' size-in-bits='32' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='482' column='1' hash='f0c050c6f9f8032e' id='154ab60a'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='FlattenableHelperInterface' visibility='default' is-declaration-only='yes' id='783cc67a'/>
@@ -17139,7 +17139,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <function-decl name='writeInt32' mangled-name='_ZN7android6Parcel10writeInt32Ei' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='114' column='1' visibility='default' binding='global' size-in-bits='32' hash='369bf6ce5c75f19#2'>
+          <function-decl name='writeInt32' mangled-name='_ZN7android6Parcel10writeInt32Ei' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='114' column='1' visibility='default' binding='global' size-in-bits='32' hash='369bf6ce5c75f19'>
             <parameter type-id='1a1ddb91' is-artificial='yes'/>
             <parameter type-id='3ff5601b'/>
             <return type-id='6e9756f6'/>
@@ -17174,7 +17174,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
-          <function-decl name='readInt32' mangled-name='_ZNK7android6Parcel9readInt32Ev' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='286' column='1' visibility='default' binding='global' size-in-bits='32' hash='c8041b3a5ceebe4b#4'>
+          <function-decl name='readInt32' mangled-name='_ZNK7android6Parcel9readInt32Ev' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='286' column='1' visibility='default' binding='global' size-in-bits='32' hash='c8041b3a5ceebe4b'>
             <parameter type-id='79927164' is-artificial='yes'/>
             <return type-id='3ff5601b'/>
           </function-decl>
@@ -17186,7 +17186,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
-          <function-decl name='readExceptionCode' mangled-name='_ZNK7android6Parcel17readExceptionCodeEv' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='430' column='1' visibility='default' binding='global' size-in-bits='32' hash='c8041b3a5ceebe4b#4'>
+          <function-decl name='readExceptionCode' mangled-name='_ZNK7android6Parcel17readExceptionCodeEv' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='430' column='1' visibility='default' binding='global' size-in-bits='32' hash='c8041b3a5ceebe4b'>
             <parameter type-id='79927164' is-artificial='yes'/>
             <return type-id='3ff5601b'/>
           </function-decl>
@@ -23555,7 +23555,7 @@ 
       <parameter type-id='97b42359' filepath='frameworks/base/native/android/surface_control.cpp' line='183' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='ASurfaceTransactionStats_getLatchTime' mangled-name='ASurfaceTransactionStats_getLatchTime' filepath='frameworks/base/native/android/surface_control.cpp' line='207' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASurfaceTransactionStats_getLatchTime@@LIBANDROID' hash='ea08aa8832d3171d#2'>
+    <function-decl name='ASurfaceTransactionStats_getLatchTime' mangled-name='ASurfaceTransactionStats_getLatchTime' filepath='frameworks/base/native/android/surface_control.cpp' line='207' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASurfaceTransactionStats_getLatchTime@@LIBANDROID' hash='ea08aa8832d3171d'>
       <parameter type-id='b98edb26' filepath='frameworks/base/native/android/surface_control.cpp' line='207' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
@@ -23569,7 +23569,7 @@ 
       <parameter type-id='78c01427' filepath='frameworks/base/native/android/surface_control.cpp' line='220' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='ASurfaceTransactionStats_getAcquireTime' mangled-name='ASurfaceTransactionStats_getAcquireTime' filepath='frameworks/base/native/android/surface_control.cpp' line='240' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASurfaceTransactionStats_getAcquireTime@@LIBANDROID' hash='ea08aa8832d3171d#2'>
+    <function-decl name='ASurfaceTransactionStats_getAcquireTime' mangled-name='ASurfaceTransactionStats_getAcquireTime' filepath='frameworks/base/native/android/surface_control.cpp' line='240' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASurfaceTransactionStats_getAcquireTime@@LIBANDROID' hash='ea08aa8832d3171d'>
       <parameter type-id='b98edb26' filepath='frameworks/base/native/android/surface_control.cpp' line='240' column='1'/>
       <parameter type-id='0373e657' filepath='frameworks/base/native/android/surface_control.cpp' line='241' column='1'/>
       <return type-id='9da381c4'/>
@@ -23677,7 +23677,7 @@ 
     <typedef-decl name='ASurfaceControl' type-id='7df76490' filepath='frameworks/native/include/android/surface_control.h' line='47' column='1' id='8f5a19d7'/>
     <typedef-decl name='ASurfaceTransaction' type-id='62e73201' filepath='frameworks/native/include/android/surface_control.h' line='86' column='1' id='7705ff5e'/>
     <typedef-decl name='AHardwareBuffer' type-id='4d45f320' filepath='frameworks/native/libs/nativewindow/include/android/hardware_buffer.h' line='333' column='1' id='7a58eebf'/>
-    <function-type size-in-bits='32' hash='b6d18584d7e12ba7' id='8cf25b48'>
+    <function-type size-in-bits='32' hash='b6d18584d7e12ba7' id='9a6f82c8'>
       <parameter type-id='1a1ddb91'/>
       <parameter type-id='9f7200cf'/>
       <parameter type-id='b59d7dce'/>
@@ -23773,7 +23773,7 @@ 
       <parameter type-id='361f7a7d' filepath='frameworks/base/native/android/surface_texture.cpp' line='70' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='ASurfaceTexture_getTimestamp' mangled-name='ASurfaceTexture_getTimestamp' filepath='frameworks/base/native/android/surface_texture.cpp' line='74' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASurfaceTexture_getTimestamp@@LIBANDROID' hash='ea08aa8832d3171d#2'>
+    <function-decl name='ASurfaceTexture_getTimestamp' mangled-name='ASurfaceTexture_getTimestamp' filepath='frameworks/base/native/android/surface_texture.cpp' line='74' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ASurfaceTexture_getTimestamp@@LIBANDROID' hash='ea08aa8832d3171d'>
       <parameter type-id='d2546a74' filepath='frameworks/base/native/android/surface_texture.cpp' line='74' column='1'/>
       <return type-id='9da381c4'/>
     </function-decl>
@@ -26288,7 +26288,7 @@ 
       <parameter type-id='f5bea92c' filepath='frameworks/base/native/android/system_fonts.cpp' line='337' column='1'/>
       <return type-id='80f4b756'/>
     </function-decl>
-    <function-decl name='AFont_getWeight' mangled-name='AFont_getWeight' filepath='frameworks/base/native/android/system_fonts.cpp' line='342' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AFont_getWeight@@LIBANDROID' hash='e3cd00ed468e2211#2'>
+    <function-decl name='AFont_getWeight' mangled-name='AFont_getWeight' filepath='frameworks/base/native/android/system_fonts.cpp' line='342' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='AFont_getWeight@@LIBANDROID' hash='e3cd00ed468e2211'>
       <parameter type-id='f5bea92c' filepath='frameworks/base/native/android/system_fonts.cpp' line='342' column='1'/>
       <return type-id='149c6638'/>
     </function-decl>
@@ -26334,17 +26334,17 @@ 
     <function-decl name='ATrace_endSection' mangled-name='ATrace_endSection' filepath='frameworks/base/native/android/trace.cpp' line='28' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ATrace_endSection@@LIBANDROID' hash='f0c050c6f9f8032e'>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='ATrace_beginAsyncSection' mangled-name='ATrace_beginAsyncSection' filepath='frameworks/base/native/android/trace.cpp' line='32' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ATrace_beginAsyncSection@@LIBANDROID' hash='369bf6ce5c75f19#2'>
+    <function-decl name='ATrace_beginAsyncSection' mangled-name='ATrace_beginAsyncSection' filepath='frameworks/base/native/android/trace.cpp' line='32' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ATrace_beginAsyncSection@@LIBANDROID' hash='369bf6ce5c75f19'>
       <parameter type-id='80f4b756' filepath='frameworks/base/native/android/trace.cpp' line='32' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/base/native/android/trace.cpp' line='32' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='ATrace_endAsyncSection' mangled-name='ATrace_endAsyncSection' filepath='frameworks/base/native/android/trace.cpp' line='36' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ATrace_endAsyncSection@@LIBANDROID' hash='369bf6ce5c75f19#2'>
+    <function-decl name='ATrace_endAsyncSection' mangled-name='ATrace_endAsyncSection' filepath='frameworks/base/native/android/trace.cpp' line='36' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ATrace_endAsyncSection@@LIBANDROID' hash='369bf6ce5c75f19'>
       <parameter type-id='80f4b756' filepath='frameworks/base/native/android/trace.cpp' line='32' column='1'/>
       <parameter type-id='3ff5601b' filepath='frameworks/base/native/android/trace.cpp' line='32' column='1'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='ATrace_setCounter' mangled-name='ATrace_setCounter' filepath='frameworks/base/native/android/trace.cpp' line='40' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ATrace_setCounter@@LIBANDROID' hash='c717d391a2b5115f#3'>
+    <function-decl name='ATrace_setCounter' mangled-name='ATrace_setCounter' filepath='frameworks/base/native/android/trace.cpp' line='40' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='ATrace_setCounter@@LIBANDROID' hash='c717d391a2b5115f'>
       <parameter type-id='80f4b756' filepath='frameworks/base/native/android/trace.cpp' line='40' column='1'/>
       <parameter type-id='9da381c4' filepath='frameworks/base/native/android/trace.cpp' line='40' column='1'/>
       <return type-id='48b5725f'/>
@@ -26366,7 +26366,7 @@ 
       <parameter type-id='95e97e5e'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='atrace_int64_body' filepath='system/core/libcutils/include/cutils/trace.h' line='239' column='1' visibility='default' binding='global' size-in-bits='32' hash='c717d391a2b5115f#4'>
+    <function-decl name='atrace_int64_body' filepath='system/core/libcutils/include/cutils/trace.h' line='239' column='1' visibility='default' binding='global' size-in-bits='32' hash='c717d391a2b5115f#2'>
       <parameter type-id='80f4b756'/>
       <parameter type-id='95e97e60'/>
       <return type-id='48b5725f'/>
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 db5aaa04..c8f2d7c7 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -2638,7 +2638,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <function-decl name='operator--' mangled-name='_ZN5boost15iterator_facadeINS_10filesystem4path8iteratorEKS2_NS_27bidirectional_traversal_tagERS4_lEmmEi' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15iterator_facadeINS_10filesystem4path8iteratorEKS2_NS_27bidirectional_traversal_tagERS4_lEmmEi' hash='c175301e4265186c#2'>
+          <function-decl name='operator--' mangled-name='_ZN5boost15iterator_facadeINS_10filesystem4path8iteratorEKS2_NS_27bidirectional_traversal_tagERS4_lEmmEi' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15iterator_facadeINS_10filesystem4path8iteratorEKS2_NS_27bidirectional_traversal_tagERS4_lEmmEi' hash='c175301e4265186c'>
             <parameter type-id='type-id-349' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-337'/>
@@ -2711,7 +2711,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
-          <function-decl name='operator-&gt;' mangled-name='_ZNK5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEEptEv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEEptEv' hash='8d6dd888776a11fb'>
+          <function-decl name='operator-&gt;' mangled-name='_ZNK5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEEptEv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEEptEv' hash='8d6dd888776a11fb#2'>
             <parameter type-id='type-id-440' is-artificial='yes'/>
             <return type-id='type-id-613'/>
           </function-decl>
@@ -2763,7 +2763,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
-          <function-decl name='operator-&gt;' mangled-name='_ZNK5boost10shared_ptrINS_10filesystem16filesystem_error5m_impEEptEv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost10shared_ptrINS_10filesystem16filesystem_error5m_impEEptEv' hash='8d6dd888776a11fb'>
+          <function-decl name='operator-&gt;' mangled-name='_ZNK5boost10shared_ptrINS_10filesystem16filesystem_error5m_impEEptEv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost10shared_ptrINS_10filesystem16filesystem_error5m_impEEptEv' hash='8d6dd888776a11fb#2'>
             <parameter type-id='type-id-444' is-artificial='yes'/>
             <return type-id='type-id-616'/>
           </function-decl>
@@ -4244,7 +4244,7 @@ 
         <parameter type-id='type-id-43'/>
         <return type-id='type-id-1'/>
       </function-decl>
-      <function-decl name='operator&lt; &lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_' hash='e8e528911feeed4f#2'>
+      <function-decl name='operator&lt; &lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_' hash='e8e528911feeed4f'>
         <parameter type-id='type-id-142'/>
         <parameter type-id='type-id-142'/>
         <return type-id='type-id-1'/>
@@ -4255,7 +4255,7 @@ 
         <parameter type-id='type-id-231'/>
         <return type-id='type-id-228'/>
       </function-decl>
-      <function-decl name='distance&lt;char const*&gt;' mangled-name='_ZSt8distanceIPKcENSt15iterator_traitsIT_E15difference_typeES3_S3_' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8distanceIPKcENSt15iterator_traitsIT_E15difference_typeES3_S3_' hash='4e076abb07cc8f73#2'>
+      <function-decl name='distance&lt;char const*&gt;' mangled-name='_ZSt8distanceIPKcENSt15iterator_traitsIT_E15difference_typeES3_S3_' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8distanceIPKcENSt15iterator_traitsIT_E15difference_typeES3_S3_' hash='4e076abb07cc8f73'>
         <parameter type-id='type-id-43'/>
         <parameter type-id='type-id-43'/>
         <return type-id='type-id-228'/>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index f310b759..32bf5bb1 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -7076,7 +7076,7 @@ 
         <parameter type-id='type-id-1412'/>
         <return type-id='type-id-1412'/>
       </function-decl>
-      <function-decl name='__niter_base&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_' hash='659ced78215eae4a'>
+      <function-decl name='__niter_base&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-127'/>
         <return type-id='type-id-2616'/>
       </function-decl>
@@ -7309,7 +7309,7 @@ 
         <parameter type-id='type-id-2046'/>
         <return type-id='type-id-2657'/>
       </function-decl>
-      <function-decl name='get&lt;1ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' mangled-name='_ZSt3getILm1EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_' filepath='/usr/include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' mangled-name='_ZSt3getILm1EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_' filepath='/usr/include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2046'/>
         <return type-id='type-id-2659'/>
       </function-decl>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 1702be09..6676461e 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -11394,7 +11394,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <function-decl name='destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_' hash='659ced78215eae4a#2'>
+          <function-decl name='destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_' hash='659ced78215eae4a'>
             <parameter type-id='type-id-2102'/>
             <parameter type-id='type-id-1582'/>
             <return type-id='type-id-2813'/>
@@ -11478,7 +11478,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <function-decl name='destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE7destroyIS8_EEvRS9_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE7destroyIS8_EEvRS9_PT_' hash='659ced78215eae4a#2'>
+          <function-decl name='destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE7destroyIS8_EEvRS9_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE7destroyIS8_EEvRS9_PT_' hash='659ced78215eae4a'>
             <parameter type-id='type-id-2107'/>
             <parameter type-id='type-id-1808'/>
             <return type-id='type-id-2813'/>
@@ -13869,11 +13869,11 @@ 
         <parameter type-id='type-id-2502' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3165'/>
       </function-decl>
-      <function-decl name='get&lt;1, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' mangled-name='_ZSt3getILm1EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' mangled-name='_ZSt3getILm1EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2499' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3167'/>
       </function-decl>
-      <function-decl name='get&lt;1, mongo::OperationContext *, mongo::Status&gt;' mangled-name='_ZSt3getILm1EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, mongo::OperationContext *, mongo::Status&gt;' mangled-name='_ZSt3getILm1EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2502' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3169'/>
       </function-decl>
@@ -13889,7 +13889,7 @@ 
         <parameter type-id='type-id-2511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3175'/>
       </function-decl>
-      <function-decl name='get&lt;2, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;2, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2526' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3175'/>
       </function-decl>
@@ -13901,7 +13901,7 @@ 
         <parameter type-id='type-id-2508' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3177'/>
       </function-decl>
-      <function-decl name='get&lt;3, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;3, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3179'/>
       </function-decl>
@@ -13913,15 +13913,15 @@ 
         <parameter type-id='type-id-2517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3179'/>
       </function-decl>
-      <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a#3'>
         <parameter type-id='type-id-2511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3181'/>
       </function-decl>
-      <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2514' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3181'/>
       </function-decl>
-      <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3181'/>
       </function-decl>
@@ -13933,39 +13933,39 @@ 
         <parameter type-id='type-id-2523' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3183'/>
       </function-decl>
-      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a#3'>
         <parameter type-id='type-id-2526' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
-      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2529' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
-      <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a#3'>
         <parameter type-id='type-id-2514' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
-      <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a#3'>
         <parameter type-id='type-id-2517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
-      <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a#4'>
         <parameter type-id='type-id-2511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
-      <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a#4'>
         <parameter type-id='type-id-2514' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3188'/>
       </function-decl>
-      <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a#4'>
         <parameter type-id='type-id-2517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3188'/>
       </function-decl>
-      <function-decl name='get&lt;1, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3190'/>
       </function-decl>
-      <function-decl name='get&lt;1, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2520' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3192'/>
       </function-decl>
@@ -13977,35 +13977,35 @@ 
         <parameter type-id='type-id-2535' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3196'/>
       </function-decl>
-      <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a#4'>
         <parameter type-id='type-id-2526' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3198'/>
       </function-decl>
-      <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a#3'>
         <parameter type-id='type-id-2529' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3198'/>
       </function-decl>
-      <function-decl name='get&lt;5, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;5, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a#5'>
         <parameter type-id='type-id-2511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3198'/>
       </function-decl>
-      <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' hash='659ced78215eae4a#5'>
         <parameter type-id='type-id-2514' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3200'/>
       </function-decl>
-      <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a#5'>
         <parameter type-id='type-id-2517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3200'/>
       </function-decl>
-      <function-decl name='get&lt;0, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' mangled-name='_ZSt3getILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' mangled-name='_ZSt3getILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-2538' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3202'/>
       </function-decl>
-      <function-decl name='get&lt;5, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;5, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' hash='659ced78215eae4a#6'>
         <parameter type-id='type-id-2517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3204'/>
       </function-decl>
-      <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' hash='659ced78215eae4a#6'>
         <parameter type-id='type-id-2511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3206'/>
       </function-decl>
@@ -14248,7 +14248,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
-          <function-decl name='toMillisSinceEpoch' mangled-name='_ZNK5mongo6Date_t18toMillisSinceEpochEv' filepath='src/mongo/util/time_support.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_t18toMillisSinceEpochEv' hash='8d6dd888776a11fb#2'>
+          <function-decl name='toMillisSinceEpoch' mangled-name='_ZNK5mongo6Date_t18toMillisSinceEpochEv' filepath='src/mongo/util/time_support.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_t18toMillisSinceEpochEv' hash='8d6dd888776a11fb'>
             <parameter type-id='type-id-331' is-artificial='yes'/>
             <return type-id='type-id-45'/>
           </function-decl>
@@ -14584,13 +14584,13 @@ 
           <var-decl name='_w' type-id='type-id-88' visibility='default' filepath='src/mongo/platform/random.h' line='80' column='1'/>
         </data-member>
         <member-function access='public'>
-          <function-decl name='nextInt64' mangled-name='_ZN5mongo12PseudoRandom9nextInt64Ev' filepath='src/mongo/platform/random.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb#2'>
+          <function-decl name='nextInt64' mangled-name='_ZN5mongo12PseudoRandom9nextInt64Ev' filepath='src/mongo/platform/random.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb'>
             <parameter type-id='type-id-1512' is-artificial='yes'/>
             <return type-id='type-id-89'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <function-decl name='nextInt64' mangled-name='_ZN5mongo12PseudoRandom9nextInt64El' filepath='src/mongo/platform/random.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12PseudoRandom9nextInt64El' hash='659ced78215eae4a#2'>
+          <function-decl name='nextInt64' mangled-name='_ZN5mongo12PseudoRandom9nextInt64El' filepath='src/mongo/platform/random.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12PseudoRandom9nextInt64El' hash='659ced78215eae4a'>
             <parameter type-id='type-id-1512' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <return type-id='type-id-89'/>
@@ -19097,7 +19097,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_' hash='659ced78215eae4a#2'>
+          <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_' hash='659ced78215eae4a'>
             <parameter type-id='type-id-4009'/>
             <parameter type-id='type-id-1549'/>
             <return type-id='type-id-2813'/>
@@ -19577,7 +19577,7 @@ 
         <parameter type-id='type-id-4064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3181'/>
       </function-decl>
-      <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-4067' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-4221'/>
       </function-decl>
@@ -19585,15 +19585,15 @@ 
         <parameter type-id='type-id-4070' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-4221'/>
       </function-decl>
-      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' hash='659ced78215eae4a#3'>
         <parameter type-id='type-id-4067' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
-      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-4070' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
-      <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a'>
+      <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' hash='659ced78215eae4a#2'>
         <parameter type-id='type-id-4064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-3186'/>
       </function-decl>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index 92f8a170..26346cda 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -521,7 +521,7 @@ 
       <parameter type-id='type-id-31' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='815' column='1'/>
       <return type-id='type-id-7'/>
     </function-decl>
-    <function-decl name='dbus_bus_get_unix_user' mangled-name='dbus_bus_get_unix_user' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_bus_get_unix_user' hash='ba687bdd05d466a5#2'>
+    <function-decl name='dbus_bus_get_unix_user' mangled-name='dbus_bus_get_unix_user' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_bus_get_unix_user' hash='ba687bdd05d466a5'>
       <parameter type-id='type-id-31' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='865' column='1'/>
       <parameter type-id='type-id-7' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='866' column='1'/>
       <parameter type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='867' column='1'/>
@@ -1396,7 +1396,7 @@ 
     <pointer-type-def type-id='type-id-148' size-in-bits='64' hash='65dceb465fce5fec' id='type-id-151'/>
     <qualified-type-def type-id='type-id-78' const='yes' hash='6d306b4a290bebfb' id='type-id-152'/>
     <pointer-type-def type-id='type-id-152' size-in-bits='64' hash='65225f09c506a5b' id='type-id-153'/>
-    <function-decl name='dbus_message_set_serial' mangled-name='dbus_message_set_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_set_serial' hash='648097d4f5419b81#2'>
+    <function-decl name='dbus_message_set_serial' mangled-name='dbus_message_set_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_set_serial' hash='648097d4f5419b81'>
       <parameter type-id='type-id-37' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='254' column='1'/>
       <parameter type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='255' column='1'/>
       <return type-id='type-id-24'/>
@@ -1405,7 +1405,7 @@ 
       <parameter type-id='type-id-37' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1690' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <function-decl name='dbus_message_get_serial' mangled-name='dbus_message_get_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_serial' hash='41b53655394fed34#2'>
+    <function-decl name='dbus_message_get_serial' mangled-name='dbus_message_get_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_serial' hash='41b53655394fed34'>
       <parameter type-id='type-id-37' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1'/>
       <return type-id='type-id-15'/>
     </function-decl>
@@ -1414,7 +1414,7 @@ 
       <parameter type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1144' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='dbus_message_get_reply_serial' mangled-name='dbus_message_get_reply_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_reply_serial' hash='41b53655394fed34#2'>
+    <function-decl name='dbus_message_get_reply_serial' mangled-name='dbus_message_get_reply_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_reply_serial' hash='41b53655394fed34'>
       <parameter type-id='type-id-37' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='1163' column='1'/>
       <return type-id='type-id-15'/>
     </function-decl>
@@ -2322,7 +2322,7 @@ 
       <parameter type-id='type-id-91' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='586' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <function-decl name='dbus_watch_get_flags' mangled-name='dbus_watch_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_flags' hash='41b53655394fed34#2'>
+    <function-decl name='dbus_watch_get_flags' mangled-name='dbus_watch_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_flags' hash='41b53655394fed34'>
       <parameter type-id='type-id-91' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1'/>
       <return type-id='type-id-8'/>
     </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 0677ec92..ec1ae1d2 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -4517,7 +4517,7 @@ 
     <pointer-type-def type-id='type-id-564' size-in-bits='64' hash='107794f9f28e8921' id='type-id-554'/>
     <pointer-type-def type-id='type-id-565' size-in-bits='64' hash='dbd7ab063e7da6ba' id='type-id-535'/>
     <pointer-type-def type-id='type-id-569' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-552'/>
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-558'/>
+    <pointer-type-def type-id='type-id-570' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-558'/>
     <pointer-type-def type-id='type-id-571' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-528'/>
     <pointer-type-def type-id='type-id-572' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-538'/>
     <pointer-type-def type-id='type-id-573' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-537'/>
@@ -4605,7 +4605,7 @@ 
       <parameter type-id='type-id-545'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' hash='d97f95fe79cacdf1#2' id='type-id-570'>
+    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='type-id-570'>
       <parameter type-id='type-id-568'/>
       <parameter type-id='type-id-568'/>
       <return type-id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 05ceb7a4..696f3209 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1623,7 +1623,7 @@ 
       <parameter type-id='type-id-21' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2972' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64' hash='c9b95df6dd500340#2'>
+    <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64' hash='c9b95df6dd500340'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-4'/>
@@ -1767,10 +1767,10 @@ 
     <function-decl name='__errno_location' filepath='/usr/include/bits/errno.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb'>
       <return type-id='type-id-39'/>
     </function-decl>
-    <function-decl name='getpagesize' filepath='/usr/include/unistd.h' line='992' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='getpagesize' filepath='/usr/include/unistd.h' line='992' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-type size-in-bits='64' hash='d97f95fe79cacdf1#2' id='type-id-40'>
+    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='type-id-40'>
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
@@ -1827,7 +1827,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-type size-in-bits='64' hash='878a7be8e06969cb#2' id='type-id-46'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='type-id-46'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-type>
@@ -2299,19 +2299,19 @@ 
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
-    <function-decl name='__asan_internal_memcpy' mangled-name='__asan_internal_memcpy' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcpy' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__asan_internal_memcpy' mangled-name='__asan_internal_memcpy' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcpy' hash='8d6dd888776a11fb'>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='__asan_internal_memset' mangled-name='__asan_internal_memset' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memset' hash='41b53655394fed34#2'>
+    <function-decl name='__asan_internal_memset' mangled-name='__asan_internal_memset' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memset' hash='41b53655394fed34'>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='__asan_internal_memcmp' mangled-name='__asan_internal_memcmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcmp' hash='41b53655394fed34#2'>
+    <function-decl name='__asan_internal_memcmp' mangled-name='__asan_internal_memcmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_memcmp' hash='41b53655394fed34'>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-11'/>
@@ -2322,17 +2322,17 @@ 
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__asan_internal_strncmp' mangled-name='__asan_internal_strncmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strncmp' hash='c9b95df6dd500340#3'>
+    <function-decl name='__asan_internal_strncmp' mangled-name='__asan_internal_strncmp' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strncmp' hash='c9b95df6dd500340'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__asan_internal_strlen' mangled-name='__asan_internal_strlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strlen' hash='659ced78215eae4a#2'>
+    <function-decl name='__asan_internal_strlen' mangled-name='__asan_internal_strlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strlen' hash='659ced78215eae4a'>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-11'/>
     </function-decl>
-    <function-decl name='__asan_internal_strnlen' mangled-name='__asan_internal_strnlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strnlen' hash='4e076abb07cc8f73#2'>
+    <function-decl name='__asan_internal_strnlen' mangled-name='__asan_internal_strnlen' filepath='../../.././libsanitizer/libbacktrace/bridge.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_internal_strnlen' hash='4e076abb07cc8f73'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-11'/>
@@ -2344,7 +2344,7 @@ 
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-91'/>
     </function-type>
-    <function-type size-in-bits='64' hash='c9b95df6dd500340#2' id='type-id-93'>
+    <function-type size-in-bits='64' hash='c9b95df6dd500340' id='type-id-93'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-91'/>
@@ -2965,7 +2965,7 @@ 
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-163'/>
     </function-type>
-    <function-type size-in-bits='64' hash='d97f95fe79cacdf1#2' id='type-id-254'>
+    <function-type size-in-bits='64' hash='d97f95fe79cacdf1' id='type-id-254'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-type>
@@ -3581,7 +3581,7 @@ 
     <pointer-type-def type-id='type-id-277' size-in-bits='64' hash='c806824f89817ec9' id='type-id-278'/>
     <namespace-decl name='__sanitizer'>
     </namespace-decl>
-    <function-decl name='pthread_self' filepath='/usr/include/pthread.h' line='267' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb#5'>
+    <function-decl name='pthread_self' filepath='/usr/include/pthread.h' line='267' column='1' visibility='default' binding='global' size-in-bits='64' hash='8d6dd888776a11fb'>
       <return type-id='type-id-275'/>
     </function-decl>
     <function-decl name='madvise' filepath='/usr/include/sys/mman.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64' hash='89d05a3a3b484799'>
@@ -3600,10 +3600,10 @@ 
       <parameter type-id='type-id-278'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='getuid' filepath='/usr/include/unistd.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#4'>
+    <function-decl name='getuid' filepath='/usr/include/unistd.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-273'/>
     </function-decl>
-    <function-decl name='isatty' filepath='/usr/include/unistd.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb#2'>
+    <function-decl name='isatty' filepath='/usr/include/unistd.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -3611,7 +3611,7 @@ 
       <parameter type-id='type-id-152'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='878a7be8e06969cb#2' id='type-id-282'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='type-id-282'>
       <parameter type-id='type-id-188'/>
       <return type-id='type-id-188'/>
     </function-type>
@@ -3959,7 +3959,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='getdtablesize' filepath='/usr/include/unistd.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='getdtablesize' filepath='/usr/include/unistd.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-type size-in-bits='64' hash='725e5bb46caf734a' id='type-id-366'>
@@ -4666,12 +4666,12 @@ 
     <pointer-type-def type-id='type-id-998' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-621'/>
     <pointer-type-def type-id='type-id-999' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-816'/>
     <pointer-type-def type-id='type-id-1000' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-734'/>
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-736'/>
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-736'/>
     <pointer-type-def type-id='type-id-1002' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-824'/>
     <pointer-type-def type-id='type-id-1003' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-798'/>
     <pointer-type-def type-id='type-id-1004' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-806'/>
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-730'/>
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' hash='c66cdd9c5848f363#3' id='type-id-732'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-730'/>
+    <pointer-type-def type-id='type-id-1006' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-732'/>
     <pointer-type-def type-id='type-id-431' size-in-bits='64' hash='3bfdd3d1296178e3' id='type-id-1007'/>
     <qualified-type-def type-id='type-id-1007' const='yes' hash='1867b5a8bfa95601' id='type-id-1008'/>
     <pointer-type-def type-id='type-id-441' size-in-bits='64' hash='8835fe4c7abaf10a' id='type-id-1009'/>
@@ -4830,7 +4830,7 @@ 
     <pointer-type-def type-id='type-id-31' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-908'/>
     <pointer-type-def type-id='type-id-370' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-478'/>
     <pointer-type-def type-id='type-id-1184' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-922'/>
-    <pointer-type-def type-id='type-id-93' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-93' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-924'/>
     <pointer-type-def type-id='type-id-1185' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-484'/>
     <pointer-type-def type-id='type-id-1186' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-531'/>
     <pointer-type-def type-id='type-id-1187' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-713'/>
@@ -4855,23 +4855,23 @@ 
     <pointer-type-def type-id='type-id-1204' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-471'/>
     <pointer-type-def type-id='type-id-1205' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-960'/>
     <pointer-type-def type-id='type-id-1206' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-867'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-648'/>
+    <pointer-type-def type-id='type-id-1207' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-648'/>
     <pointer-type-def type-id='type-id-1208' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-728'/>
     <pointer-type-def type-id='type-id-1209' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-586'/>
     <pointer-type-def type-id='type-id-1210' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-875'/>
     <pointer-type-def type-id='type-id-1211' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-628'/>
     <pointer-type-def type-id='type-id-1212' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-552'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-516'/>
     <pointer-type-def type-id='type-id-1214' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-504'/>
     <pointer-type-def type-id='type-id-1215' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-502'/>
     <pointer-type-def type-id='type-id-1216' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-861'/>
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-949'/>
+    <pointer-type-def type-id='type-id-1217' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-949'/>
     <pointer-type-def type-id='type-id-1218' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-567'/>
     <pointer-type-def type-id='type-id-1219' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-711'/>
     <pointer-type-def type-id='type-id-281' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-510'/>
     <pointer-type-def type-id='type-id-1220' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-469'/>
     <pointer-type-def type-id='type-id-40' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-706'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-493'/>
     <pointer-type-def type-id='type-id-1221' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-724'/>
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-512'/>
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-738'/>
@@ -4887,13 +4887,13 @@ 
     <pointer-type-def type-id='type-id-1233' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-606'/>
     <pointer-type-def type-id='type-id-1234' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-852'/>
     <pointer-type-def type-id='type-id-1235' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-667'/>
-    <pointer-type-def type-id='type-id-1236' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-708'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-708'/>
     <pointer-type-def type-id='type-id-1237' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-775'/>
     <pointer-type-def type-id='type-id-33' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-12'/>
     <pointer-type-def type-id='type-id-1238' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-765'/>
     <pointer-type-def type-id='type-id-1239' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-746'/>
     <pointer-type-def type-id='type-id-94' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-684'/>
-    <pointer-type-def type-id='type-id-1240' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-750'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-750'/>
     <pointer-type-def type-id='type-id-1241' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-760'/>
     <pointer-type-def type-id='type-id-1242' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-757'/>
     <pointer-type-def type-id='type-id-1243' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-596'/>
@@ -4905,8 +4905,8 @@ 
     <pointer-type-def type-id='type-id-1249' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-830'/>
     <pointer-type-def type-id='type-id-438' size-in-bits='64' hash='aaf8207af8bd0045' id='type-id-1250'/>
     <pointer-type-def type-id='type-id-42' size-in-bits='64' hash='9028994eadde34f6#2' id='type-id-1251'/>
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-859'/>
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-859'/>
+    <pointer-type-def type-id='type-id-1253' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-822'/>
     <pointer-type-def type-id='type-id-445' size-in-bits='64' hash='56f2b28d742224a3' id='type-id-1254'/>
     <pointer-type-def type-id='type-id-447' size-in-bits='64' hash='d0d4f07ec2bffa5f' id='type-id-450'/>
     <pointer-type-def type-id='type-id-448' size-in-bits='64' hash='8640e159f1a5d23d' id='type-id-1255'/>
@@ -4939,7 +4939,7 @@ 
     <pointer-type-def type-id='type-id-1278' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-818'/>
     <pointer-type-def type-id='type-id-95' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-682'/>
     <pointer-type-def type-id='type-id-1279' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-695'/>
-    <pointer-type-def type-id='type-id-1280' size-in-bits='64' hash='c66cdd9c5848f363#2' id='type-id-697'/>
+    <pointer-type-def type-id='type-id-1280' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-697'/>
     <pointer-type-def type-id='type-id-96' size-in-bits='64' hash='c66cdd9c5848f363' id='type-id-686'/>
     <qualified-type-def type-id='type-id-1082' volatile='yes' hash='ee38765bcce740cc' id='type-id-1141'/>
     <pointer-type-def type-id='type-id-1141' size-in-bits='64' hash='dd03fc8bc6e1cbaf' id='type-id-1281'/>
@@ -5274,7 +5274,7 @@ 
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_strncmp' mangled-name='__interceptor_strncmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncmp' hash='c9b95df6dd500340#2'>
+    <function-decl name='__interceptor_strncmp' mangled-name='__interceptor_strncmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncmp' hash='c9b95df6dd500340'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-91'/>
@@ -5312,14 +5312,14 @@ 
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <return type-id='type-id-466'/>
     </function-decl>
-    <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread' hash='3e037c50bc1cf9e7#3'>
+    <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread' hash='3e037c50bc1cf9e7'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-463' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <return type-id='type-id-466'/>
     </function-decl>
-    <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64' hash='3e037c50bc1cf9e7#2'>
+    <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64' hash='3e037c50bc1cf9e7'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
@@ -5332,7 +5332,7 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <return type-id='type-id-466'/>
     </function-decl>
-    <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv' hash='20d3d8148d4164fa#2'>
+    <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv' hash='20d3d8148d4164fa'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-1063' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
@@ -5352,7 +5352,7 @@ 
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <return type-id='type-id-466'/>
     </function-decl>
-    <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite' hash='3e037c50bc1cf9e7#3'>
+    <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite' hash='3e037c50bc1cf9e7'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
@@ -5372,7 +5372,7 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <return type-id='type-id-466'/>
     </function-decl>
-    <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev' hash='20d3d8148d4164fa#2'>
+    <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev' hash='20d3d8148d4164fa'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-1063' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
@@ -5508,7 +5508,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_ioctl' mangled-name='__interceptor_ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ioctl' hash='8cead6bbcfb9a639#2'>
+    <function-decl name='__interceptor_ioctl' mangled-name='__interceptor_ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ioctl' hash='8cead6bbcfb9a639'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
@@ -5551,7 +5551,7 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_waitpid' mangled-name='__interceptor_waitpid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitpid' hash='5ea177ff0b0204e9#2'>
+    <function-decl name='__interceptor_waitpid' mangled-name='__interceptor_waitpid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitpid' hash='5ea177ff0b0204e9'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <parameter type-id='type-id-39' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
@@ -5705,7 +5705,7 @@ 
       <parameter type-id='type-id-194' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_sysinfo' mangled-name='__interceptor_sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sysinfo' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sysinfo' mangled-name='__interceptor_sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sysinfo' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -5932,11 +5932,11 @@ 
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_mutex_lock' mangled-name='__interceptor_pthread_mutex_lock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_lock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_lock' mangled-name='__interceptor_pthread_mutex_lock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_lock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_mutex_unlock' mangled-name='__interceptor_pthread_mutex_unlock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_unlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_unlock' mangled-name='__interceptor_pthread_mutex_unlock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_unlock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -5950,11 +5950,11 @@ 
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_cond_signal' mangled-name='__interceptor_pthread_cond_signal' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_signal' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_cond_signal' mangled-name='__interceptor_pthread_cond_signal' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_signal' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_cond_broadcast' mangled-name='__interceptor_pthread_cond_broadcast' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_broadcast' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_cond_broadcast' mangled-name='__interceptor_pthread_cond_broadcast' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_broadcast' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -10739,11 +10739,11 @@ 
       </class-decl>
       <typedef-decl name='u16' type-id='type-id-247' size-in-bits='16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='67' column='1' hash='c392bb1926b4b6c2' id='type-id-1293'/>
     </namespace-decl>
-    <function-decl name='pthread_attr_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='pthread_attr_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='pthread_attr_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='pthread_attr_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -10752,7 +10752,7 @@ 
       <parameter type-id='type-id-521'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='pthread_setspecific' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='47' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb#2'>
+    <function-decl name='pthread_setspecific' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='47' column='1' visibility='default' binding='global' size-in-bits='64' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
@@ -10762,7 +10762,7 @@ 
       <parameter type-id='type-id-39' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='pthread_yield' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='pthread_yield' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='pthread_sigmask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64' hash='963d0c5a82ef7e86'>
@@ -10774,7 +10774,7 @@ 
     <function-decl name='pthread_self' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64' hash='61477c4d1fd8d94d'>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='fileno_unlocked' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='fileno_unlocked' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -10797,11 +10797,11 @@ 
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_sleep' mangled-name='__interceptor_sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sleep' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_sleep' mangled-name='__interceptor_sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sleep' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-188'/>
       <return type-id='type-id-188'/>
     </function-decl>
-    <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep' hash='41b53655394fed34#3'>
+    <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep' hash='41b53655394fed34'>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -10815,7 +10815,7 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='__interceptor_dlclose' mangled-name='__interceptor_dlclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlclose' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_dlclose' mangled-name='__interceptor_dlclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlclose' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -10834,19 +10834,19 @@ 
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_setjmp' mangled-name='__interceptor_setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_setjmp' mangled-name='__interceptor_setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setjmp' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor__setjmp' mangled-name='__interceptor__setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__setjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor__setjmp' mangled-name='__interceptor__setjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__setjmp' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_sigsetjmp' mangled-name='__interceptor_sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsetjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sigsetjmp' mangled-name='__interceptor_sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsetjmp' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor___sigsetjmp' mangled-name='__interceptor___sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___sigsetjmp' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor___sigsetjmp' mangled-name='__interceptor___sigsetjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___sigsetjmp' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11002,7 +11002,7 @@ 
       <parameter type-id='type-id-4' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6039' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='__interceptor_mmap' mangled-name='__interceptor_mmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mmap' hash='4c318d5d67c5b956#2'>
+    <function-decl name='__interceptor_mmap' mangled-name='__interceptor_mmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mmap' hash='4c318d5d67c5b956'>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
@@ -11020,7 +11020,7 @@ 
       <parameter type-id='type-id-119' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='__interceptor_munmap' mangled-name='__interceptor_munmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munmap' hash='41b53655394fed34#2'>
+    <function-decl name='__interceptor_munmap' mangled-name='__interceptor_munmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munmap' hash='41b53655394fed34'>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <return type-id='type-id-6'/>
@@ -11068,7 +11068,7 @@ 
       <parameter type-id='type-id-1287' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_detach' mangled-name='__interceptor_pthread_detach' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_detach' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_detach' mangled-name='__interceptor_pthread_detach' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_detach' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11077,11 +11077,11 @@ 
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_mutex_destroy' mangled-name='__interceptor_pthread_mutex_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_destroy' mangled-name='__interceptor_pthread_mutex_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_destroy' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='__interceptor_pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_trylock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='__interceptor_pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_trylock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11095,19 +11095,19 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_spin_destroy' mangled-name='__interceptor_pthread_spin_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_destroy' mangled-name='__interceptor_pthread_spin_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_destroy' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_spin_lock' mangled-name='__interceptor_pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_lock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_lock' mangled-name='__interceptor_pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_lock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_spin_trylock' mangled-name='__interceptor_pthread_spin_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_trylock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_trylock' mangled-name='__interceptor_pthread_spin_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_trylock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_spin_unlock' mangled-name='__interceptor_pthread_spin_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_unlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_spin_unlock' mangled-name='__interceptor_pthread_spin_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_unlock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11116,15 +11116,15 @@ 
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_rwlock_destroy' mangled-name='__interceptor_pthread_rwlock_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_destroy' mangled-name='__interceptor_pthread_rwlock_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_destroy' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_rwlock_rdlock' mangled-name='__interceptor_pthread_rwlock_rdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_rdlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_rdlock' mangled-name='__interceptor_pthread_rwlock_rdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_rdlock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='__interceptor_pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_tryrdlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='__interceptor_pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_tryrdlock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11133,11 +11133,11 @@ 
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_rwlock_wrlock' mangled-name='__interceptor_pthread_rwlock_wrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_wrlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_wrlock' mangled-name='__interceptor_pthread_rwlock_wrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_wrlock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='__interceptor_pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_trywrlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='__interceptor_pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_trywrlock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11146,11 +11146,11 @@ 
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_rwlock_unlock' mangled-name='__interceptor_pthread_rwlock_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_unlock' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_rwlock_unlock' mangled-name='__interceptor_pthread_rwlock_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_unlock' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_cond_destroy' mangled-name='__interceptor_pthread_cond_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_cond_destroy' mangled-name='__interceptor_pthread_cond_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_destroy' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11160,17 +11160,17 @@ 
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_barrier_init' mangled-name='__interceptor_pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_init' hash='878a7be8e06969cb#3'>
+    <function-decl name='__interceptor_pthread_barrier_init' mangled-name='__interceptor_pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_init' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_barrier_destroy' mangled-name='__interceptor_pthread_barrier_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_barrier_destroy' mangled-name='__interceptor_pthread_barrier_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_destroy' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_pthread_barrier_wait' mangled-name='__interceptor_pthread_barrier_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_wait' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_pthread_barrier_wait' mangled-name='__interceptor_pthread_barrier_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_wait' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11185,15 +11185,15 @@ 
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_sem_destroy' mangled-name='__interceptor_sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_destroy' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_destroy' mangled-name='__interceptor_sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_destroy' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_sem_wait' mangled-name='__interceptor_sem_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_wait' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_wait' mangled-name='__interceptor_sem_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_wait' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_sem_trywait' mangled-name='__interceptor_sem_trywait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_trywait' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_trywait' mangled-name='__interceptor_sem_trywait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_trywait' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11202,7 +11202,7 @@ 
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_sem_post' mangled-name='__interceptor_sem_post' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_post' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_sem_post' mangled-name='__interceptor_sem_post' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_post' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11299,7 +11299,7 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_dup' mangled-name='__interceptor_dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_dup' mangled-name='__interceptor_dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11325,11 +11325,11 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_inotify_init' mangled-name='__interceptor_inotify_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_inotify_init' mangled-name='__interceptor_inotify_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_inotify_init1' mangled-name='__interceptor_inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init1' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_inotify_init1' mangled-name='__interceptor_inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init1' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11346,13 +11346,13 @@ 
       <parameter type-id='type-id-39' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_connect' mangled-name='__interceptor_connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_connect' hash='8cead6bbcfb9a639#2'>
+    <function-decl name='__interceptor_connect' mangled-name='__interceptor_connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_connect' hash='8cead6bbcfb9a639'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_bind' mangled-name='__interceptor_bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_bind' hash='8cead6bbcfb9a639#2'>
+    <function-decl name='__interceptor_bind' mangled-name='__interceptor_bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_bind' hash='8cead6bbcfb9a639'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
@@ -11363,19 +11363,19 @@ 
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_epoll_create' mangled-name='__interceptor_epoll_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_epoll_create' mangled-name='__interceptor_epoll_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_epoll_create1' mangled-name='__interceptor_epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create1' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_epoll_create1' mangled-name='__interceptor_epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create1' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_close' mangled-name='__interceptor_close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_close' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_close' mangled-name='__interceptor_close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_close' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor___close' mangled-name='__interceptor___close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___close' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor___close' mangled-name='__interceptor___close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___close' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11393,20 +11393,20 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_send' mangled-name='__interceptor_send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_send' hash='46a36be02626e010#2'>
+    <function-decl name='__interceptor_send' mangled-name='__interceptor_send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_send' hash='46a36be02626e010'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <return type-id='type-id-664'/>
     </function-decl>
-    <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg' hash='a0b5632155c5a0df#2'>
+    <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg' hash='a0b5632155c5a0df'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <return type-id='type-id-664'/>
     </function-decl>
-    <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv' hash='46a36be02626e010#2'>
+    <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv' hash='46a36be02626e010'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
@@ -11428,7 +11428,7 @@ 
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1524' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='__interceptor_fclose' mangled-name='__interceptor_fclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fclose' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_fclose' mangled-name='__interceptor_fclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fclose' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11446,7 +11446,7 @@ 
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1'/>
       <return type-id='type-id-91'/>
     </function-decl>
-    <function-decl name='__interceptor_fflush' mangled-name='__interceptor_fflush' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fflush' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_fflush' mangled-name='__interceptor_fflush' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fflush' hash='d97f95fe79cacdf1'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11454,7 +11454,7 @@ 
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__interceptor_puts' mangled-name='__interceptor_puts' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_puts' hash='41b53655394fed34#2'>
+    <function-decl name='__interceptor_puts' mangled-name='__interceptor_puts' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_puts' hash='41b53655394fed34'>
       <parameter type-id='type-id-4' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11495,7 +11495,7 @@ 
       <parameter type-id='type-id-1129' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_raise' mangled-name='__interceptor_raise' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_raise' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_raise' mangled-name='__interceptor_raise' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_raise' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -11531,14 +11531,14 @@ 
       <parameter type-id='type-id-91' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_mlockall' mangled-name='__interceptor_mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mlockall' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_mlockall' mangled-name='__interceptor_mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mlockall' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_munlockall' mangled-name='__interceptor_munlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munlockall' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__interceptor_munlockall' mangled-name='__interceptor_munlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munlockall' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__interceptor_fork' mangled-name='__interceptor_fork' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fork' hash='878a7be8e06969cb#2'>
+    <function-decl name='__interceptor_fork' mangled-name='__interceptor_fork' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fork' hash='878a7be8e06969cb'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -12184,7 +12184,7 @@ 
       <parameter type-id='type-id-462' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <return type-id='type-id-466'/>
     </function-type>
-    <function-type size-in-bits='64' hash='20d3d8148d4164fa#2' id='type-id-1001'>
+    <function-type size-in-bits='64' hash='20d3d8148d4164fa' id='type-id-1001'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-1063' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
@@ -12210,14 +12210,14 @@ 
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <return type-id='type-id-466'/>
     </function-type>
-    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7#2' id='type-id-1005'>
+    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7' id='type-id-1005'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-462' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <return type-id='type-id-466'/>
     </function-type>
-    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7#3' id='type-id-1006'>
+    <function-type size-in-bits='64' hash='3e037c50bc1cf9e7' id='type-id-1006'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-464' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
@@ -12573,7 +12573,7 @@ 
       <parameter type-id='type-id-1129' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='41b53655394fed34#2' id='type-id-1182'>
+    <function-type size-in-bits='64' hash='41b53655394fed34' id='type-id-1182'>
       <parameter type-id='type-id-4' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
@@ -12660,7 +12660,7 @@ 
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='5ea177ff0b0204e9#2' id='type-id-1198'>
+    <function-type size-in-bits='64' hash='5ea177ff0b0204e9' id='type-id-1198'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <parameter type-id='type-id-39' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
@@ -12720,7 +12720,7 @@ 
       <parameter type-id='type-id-1258' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='8cead6bbcfb9a639#2' id='type-id-1207'>
+    <function-type size-in-bits='64' hash='8cead6bbcfb9a639' id='type-id-1207'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
@@ -12758,7 +12758,7 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='8cead6bbcfb9a639#2' id='type-id-1213'>
+    <function-type size-in-bits='64' hash='8cead6bbcfb9a639' id='type-id-1213'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
@@ -12783,7 +12783,7 @@ 
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='41b53655394fed34#3' id='type-id-1217'>
+    <function-type size-in-bits='64' hash='41b53655394fed34' id='type-id-1217'>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
@@ -12891,7 +12891,7 @@ 
       <parameter type-id='type-id-1251' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='41b53655394fed34#2' id='type-id-1236'>
+    <function-type size-in-bits='64' hash='41b53655394fed34' id='type-id-1236'>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <return type-id='type-id-6'/>
@@ -12912,7 +12912,7 @@ 
       <parameter type-id='type-id-996' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' hash='878a7be8e06969cb#3' id='type-id-1240'>
+    <function-type size-in-bits='64' hash='878a7be8e06969cb' id='type-id-1240'>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <parameter type-id='type-id-188' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
@@ -12958,13 +12958,13 @@ 
       <parameter type-id='type-id-39' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2741' column='1'/>
       <return type-id='type-id-438'/>
     </function-type>
-    <function-type size-in-bits='64' hash='a0b5632155c5a0df#2' id='type-id-1252'>
+    <function-type size-in-bits='64' hash='a0b5632155c5a0df' id='type-id-1252'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <return type-id='type-id-664'/>
     </function-type>
-    <function-type size-in-bits='64' hash='46a36be02626e010#2' id='type-id-1253'>
+    <function-type size-in-bits='64' hash='46a36be02626e010' id='type-id-1253'>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
@@ -13067,7 +13067,7 @@ 
       <parameter type-id='type-id-119' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' hash='4c318d5d67c5b956#2' id='type-id-1280'>
+    <function-type size-in-bits='64' hash='4c318d5d67c5b956' id='type-id-1280'>
       <parameter type-id='type-id-3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <parameter type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
@@ -13395,7 +13395,7 @@ 
       <parameter type-id='type-id-27' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='ValgrindSlowdown' mangled-name='ValgrindSlowdown' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ValgrindSlowdown' hash='8d6dd888776a11fb'>
@@ -15040,20 +15040,20 @@ 
     <qualified-type-def type-id='type-id-1574' const='yes' hash='31e53494bc6e5a9' id='type-id-1575'/>
     <namespace-decl name='__sanitizer'>
     </namespace-decl>
-    <function-decl name='__tsan_java_init' mangled-name='__tsan_java_init' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_init' hash='659ced78215eae4a#2'>
+    <function-decl name='__tsan_java_init' mangled-name='__tsan_java_init' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_init' hash='659ced78215eae4a'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__tsan_java_fini' mangled-name='__tsan_java_fini' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_fini' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__tsan_java_fini' mangled-name='__tsan_java_fini' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_fini' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='__tsan_java_alloc' mangled-name='__tsan_java_alloc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_alloc' hash='659ced78215eae4a#2'>
+    <function-decl name='__tsan_java_alloc' mangled-name='__tsan_java_alloc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_alloc' hash='659ced78215eae4a'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__tsan_java_free' mangled-name='__tsan_java_free' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_free' hash='659ced78215eae4a#2'>
+    <function-decl name='__tsan_java_free' mangled-name='__tsan_java_free' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_free' hash='659ced78215eae4a'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
       <return type-id='type-id-30'/>
@@ -15064,19 +15064,19 @@ 
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='219' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__tsan_java_mutex_lock' mangled-name='__tsan_java_mutex_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_lock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_lock' mangled-name='__tsan_java_mutex_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_lock' hash='8d6dd888776a11fb'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__tsan_java_mutex_unlock' mangled-name='__tsan_java_mutex_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_unlock' mangled-name='__tsan_java_mutex_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock' hash='8d6dd888776a11fb'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__tsan_java_mutex_read_lock' mangled-name='__tsan_java_mutex_read_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_lock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_read_lock' mangled-name='__tsan_java_mutex_read_lock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_lock' hash='8d6dd888776a11fb'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__tsan_java_mutex_read_unlock' mangled-name='__tsan_java_mutex_read_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_unlock' hash='8d6dd888776a11fb#2'>
+    <function-decl name='__tsan_java_mutex_read_unlock' mangled-name='__tsan_java_mutex_read_unlock' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_read_unlock' hash='8d6dd888776a11fb'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='267' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
@@ -15085,7 +15085,7 @@ 
       <parameter type-id='type-id-6' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__tsan_java_mutex_unlock_rec' mangled-name='__tsan_java_mutex_unlock_rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock_rec' hash='41b53655394fed34#2'>
+    <function-decl name='__tsan_java_mutex_unlock_rec' mangled-name='__tsan_java_mutex_unlock_rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock_rec' hash='41b53655394fed34'>
       <parameter type-id='type-id-1566' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -16357,7 +16357,7 @@ 
     </namespace-decl>
     <namespace-decl name='__tsan'>
     </namespace-decl>
-    <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64' hash='530ff15a20e9eac8#3'>
+    <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64' hash='530ff15a20e9eac8'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-1107'/>
       <parameter type-id='type-id-6'/>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 74e8af11..21fb1c8a 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -2745,7 +2745,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <function-decl name='init_device' mangled-name='_ZN6Engine11init_deviceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' line='572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine11init_deviceEv' hash='d97f95fe79cacdf1#2'>
+        <function-decl name='init_device' mangled-name='_ZN6Engine11init_deviceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' line='572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine11init_deviceEv' hash='d97f95fe79cacdf1'>
           <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-217'/>
         </function-decl>
@@ -6860,7 +6860,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <function-decl name='find' mangled-name='_ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EE4findERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EE4findERKS0_' hash='659ced78215eae4a#2'>
+          <function-decl name='find' mangled-name='_ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EE4findERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EE4findERKS0_' hash='659ced78215eae4a'>
             <parameter type-id='type-id-1079' is-artificial='yes'/>
             <parameter type-id='type-id-869'/>
             <return type-id='type-id-1337'/>
@@ -6934,7 +6934,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <function-decl name='find' mangled-name='_ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EE4findERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EE4findERKS0_' hash='659ced78215eae4a#2'>
+          <function-decl name='find' mangled-name='_ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EE4findERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EE4findERKS0_' hash='659ced78215eae4a'>
             <parameter type-id='type-id-1082' is-artificial='yes'/>
             <parameter type-id='type-id-881'/>
             <return type-id='type-id-1346'/>
@@ -6974,7 +6974,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <function-decl name='_S_whichword' mangled-name='_ZNSt12_Base_bitsetILm16EE12_S_whichwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE12_S_whichwordEm' hash='659ced78215eae4a#4'>
+          <function-decl name='_S_whichword' mangled-name='_ZNSt12_Base_bitsetILm16EE12_S_whichwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE12_S_whichwordEm' hash='659ced78215eae4a#2'>
             <parameter type-id='type-id-1124'/>
             <return type-id='type-id-1124'/>
           </function-decl>
@@ -6986,7 +6986,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <function-decl name='_S_whichbit' mangled-name='_ZNSt12_Base_bitsetILm16EE11_S_whichbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE11_S_whichbitEm' hash='659ced78215eae4a#4'>
+          <function-decl name='_S_whichbit' mangled-name='_ZNSt12_Base_bitsetILm16EE11_S_whichbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE11_S_whichbitEm' hash='659ced78215eae4a#2'>
             <parameter type-id='type-id-1124'/>
             <return type-id='type-id-1124'/>
           </function-decl>
@@ -10280,7 +10280,7 @@ 
       <parameter type-id='type-id-150' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='467' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='__offload_offload_call_count' mangled-name='__offload_offload_call_count' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__offload_offload_call_count' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='__offload_offload_call_count' mangled-name='__offload_offload_call_count' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__offload_offload_call_count' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-30'/>
     </function-decl>
     <namespace-decl name='__gnu_cxx'>
@@ -13419,7 +13419,7 @@ 
     <typedef-decl name='COIPIPELINE' type-id='type-id-2416' size-in-bits='64' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='66' column='1' id='type-id-2130'/>
     <typedef-decl name='COIBUFFER' type-id='type-id-1255' size-in-bits='64' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='70' column='1' id='type-id-2565'/>
     <typedef-decl name='COILIBRARY' type-id='type-id-2414' size-in-bits='64' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='71' column='1' id='type-id-2566'/>
-    <function-decl name='operator new' mangled-name='_ZnwmPv' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmPv' hash='8d6dd888776a11fb#2'>
+    <function-decl name='operator new' mangled-name='_ZnwmPv' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmPv' hash='8d6dd888776a11fb'>
       <parameter type-id='type-id-1124'/>
       <parameter type-id='type-id-150' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='129' column='1'/>
       <return type-id='type-id-150'/>
@@ -13452,7 +13452,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKPKN8VarTable5EntryESt6vectorIS4_SaIS4_EEEppEi' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPKPKN8VarTable5EntryESt6vectorIS4_SaIS4_EEEppEi' hash='648097d4f5419b81#2'>
+          <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKPKN8VarTable5EntryESt6vectorIS4_SaIS4_EEEppEi' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPKPKN8VarTable5EntryESt6vectorIS4_SaIS4_EEEppEi' hash='648097d4f5419b81'>
             <parameter type-id='type-id-2155' is-artificial='yes'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-2153'/>
@@ -15675,13 +15675,13 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <function-decl name='_S_whichword' mangled-name='_ZNSt12_Base_bitsetILm2EE12_S_whichwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE12_S_whichwordEm' hash='659ced78215eae4a#4'>
+          <function-decl name='_S_whichword' mangled-name='_ZNSt12_Base_bitsetILm2EE12_S_whichwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE12_S_whichwordEm' hash='659ced78215eae4a#2'>
             <parameter type-id='type-id-1124'/>
             <return type-id='type-id-1124'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
-          <function-decl name='_M_do_count' mangled-name='_ZNKSt12_Base_bitsetILm2EE11_M_do_countEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Base_bitsetILm2EE11_M_do_countEv' hash='8d6dd888776a11fb#2'>
+          <function-decl name='_M_do_count' mangled-name='_ZNKSt12_Base_bitsetILm2EE11_M_do_countEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Base_bitsetILm2EE11_M_do_countEv' hash='8d6dd888776a11fb'>
             <parameter type-id='type-id-3178' is-artificial='yes'/>
             <return type-id='type-id-1124'/>
           </function-decl>
@@ -15699,7 +15699,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <function-decl name='_S_whichbit' mangled-name='_ZNSt12_Base_bitsetILm2EE11_S_whichbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE11_S_whichbitEm' hash='659ced78215eae4a#4'>
+          <function-decl name='_S_whichbit' mangled-name='_ZNSt12_Base_bitsetILm2EE11_S_whichbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE11_S_whichbitEm' hash='659ced78215eae4a#2'>
             <parameter type-id='type-id-1124'/>
             <return type-id='type-id-1124'/>
           </function-decl>
@@ -16385,13 +16385,13 @@ 
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-154'/>
     </function-decl>
-    <function-decl name='_Offload_number_of_devices' mangled-name='_Offload_number_of_devices' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_number_of_devices' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='_Offload_number_of_devices' mangled-name='_Offload_number_of_devices' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_number_of_devices' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='_Offload_get_device_number' mangled-name='_Offload_get_device_number' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_get_device_number' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='_Offload_get_device_number' mangled-name='_Offload_get_device_number' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_get_device_number' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='_Offload_get_physical_device_number' mangled-name='_Offload_get_physical_device_number' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_get_physical_device_number' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='_Offload_get_physical_device_number' mangled-name='_Offload_get_physical_device_number' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_get_physical_device_number' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='_Offload_signaled' mangled-name='_Offload_signaled' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_signaled' hash='878a7be8e06969cb'>
@@ -16676,7 +16676,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' const='yes'>
-        <function-decl name='SharedAlignedFree' mangled-name='_ZNK10MyoWrapper17SharedAlignedFreeEPv' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10MyoWrapper17SharedAlignedFreeEPv' hash='61477c4d1fd8d94d#2'>
+        <function-decl name='SharedAlignedFree' mangled-name='_ZNK10MyoWrapper17SharedAlignedFreeEPv' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10MyoWrapper17SharedAlignedFreeEPv' hash='61477c4d1fd8d94d'>
           <parameter type-id='type-id-3489' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
@@ -16691,7 +16691,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' const='yes'>
-        <function-decl name='SharedFree' mangled-name='_ZNK10MyoWrapper10SharedFreeEPv' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10MyoWrapper10SharedFreeEPv' hash='61477c4d1fd8d94d#2'>
+        <function-decl name='SharedFree' mangled-name='_ZNK10MyoWrapper10SharedFreeEPv' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10MyoWrapper10SharedFreeEPv' hash='61477c4d1fd8d94d'>
           <parameter type-id='type-id-3489' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
@@ -17429,7 +17429,7 @@ 
       <parameter type-id='type-id-3471' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1198' column='1'/>
       <return type-id='type-id-154'/>
     </function-decl>
-    <function-decl name='__intel_cilk_for_32_offload' mangled-name='__intel_cilk_for_32_offload' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__intel_cilk_for_32_offload' hash='6d1a508451026650#2'>
+    <function-decl name='__intel_cilk_for_32_offload' mangled-name='__intel_cilk_for_32_offload' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__intel_cilk_for_32_offload' hash='6d1a508451026650'>
       <parameter type-id='type-id-30' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1209' column='1'/>
       <parameter type-id='type-id-3626' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1210' column='1'/>
       <parameter type-id='type-id-30' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1211' column='1'/>
@@ -17700,10 +17700,10 @@ 
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-154'/>
     </function-decl>
-    <function-decl name='omp_get_default_device' mangled-name='omp_get_default_device' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='omp_get_default_device' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='omp_get_default_device' mangled-name='omp_get_default_device' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='omp_get_default_device' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-30'/>
     </function-decl>
-    <function-decl name='omp_get_num_devices' mangled-name='omp_get_num_devices' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='omp_get_num_devices' hash='d97f95fe79cacdf1#2'>
+    <function-decl name='omp_get_num_devices' mangled-name='omp_get_num_devices' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='omp_get_num_devices' hash='d97f95fe79cacdf1'>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='omp_set_num_threads_target' mangled-name='omp_set_num_threads_target' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='105' colu