[1/4,applied] Improve type naming

Message ID 87r0k5nckj.fsf@redhat.com
State New
Headers
Series Support C++ pointer-to-member types |

Commit Message

Dodji Seketeli Dec. 1, 2023, 3:54 p.m. UTC
  Hello,

There are a number of glitches when pretty-printing type names.

This is particularly true for derived types like pointer to functions,
array of pointer to functions and the likes.

For instance, we can see in
tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt that a
function N that takes no parameter and returns a pointer to an array
of 7 int is pretty-printed as:

    int[7]* N()

That obviously doesn't respect the type naming rules of C or C++.

With this patch, function N is declared as:

    int(*N(void))[7]

To learn more about the impact of the patch on how types are
pretty-printed, you can look at the parts of the patch that are
adjustments to the expected output of the regression tests.

For instance, here is how the expected output of type pretty-printing
in tests/data/test-abidiff-exit/PR30048-test-2 is modified by this
patch:

    diff --git a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
    index 2650b5a0..7bbbc2e2 100644
    --- a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
    +++ b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
    @@ -3,22 +3,22 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable

     7 functions with some indirect sub-type change:

    -  [C] 'function int[7]* N()' at PR30048-test-2-v0.cc:62:1 has some indirect sub-type changes:
    +  [C] 'function int(*N(void))[7]' at PR30048-test-2-v0.cc:62:1 has some indirect sub-type changes:
	 return type changed:
    -      entity changed from 'int[7]*' to 'int'
    +      entity changed from 'int(*)[7]' to 'int'
	   type size changed from 64 to 32 (in bits)

    -  [C] 'function int* O()' at PR30048-test-2-v0.cc:64:1 has some indirect sub-type changes:
    +  [C] 'function int* O(void)' at PR30048-test-2-v0.cc:64:1 has some indirect sub-type changes:
	 return type changed:
	   entity changed from 'int*' to 'int'
	   type size changed from 64 to 32 (in bits)

    -  [C] 'function int ()* P()' at PR30048-test-2-v0.cc:67:1 has some indirect sub-type changes:
    +  [C] 'function int (*P(void))(void)' at PR30048-test-2-v0.cc:67:1 has some indirect sub-type changes:
	 return type changed:
    -      entity changed from 'int ()*' to 'int'
    +      entity changed from 'int (*)(void)' to 'int'
	   type size changed from 64 to 32 (in bits)

Note that the change to the CTF test
tests/data/test-read-ctf/test9.o.abi is triggered by a change in the
sorting of types because types are sorted alphabetically.

All in all, this is clearly an overdue improvement to the type name
pretty-printing.

	* include/abg-fwd.h (is_npaf_type, is_pointer_to_function_type)
	(is_pointer_to_array_type, is_pointer_to_npaf_type): Declare new
	functions.
	(is_pointer_type, is_reference_type, is_array_type): Take a
	boolean parameter to look through qualifiers.
	* include/abg-ir.h (is_pointer_type): Do not make this function a
	friend of the type_or_decl_base class anymore.
	* src/abg-ir.cc (pointer_declaration_name, array_declaration_name)
	(stream_pretty_representation_of_fn_parms)
	(add_outer_pointer_to_fn_type_expr)
	(add_outer_pointer_to_array_type_expr): Define new static
	functions.
	(is_npaf_type, is_pointer_to_function_type)
	(is_pointer_to_array_type, is_pointer_to_npaf_type): Define new
	functions.
	(get_type_representation): Remove the overload for array_type_def.
	(get_function_type_name, get_method_type_name)
	(function_decl::get_pretty_representation_of_declarator): Use the
	new stream_pretty_representation_of_fn_parms.  This actually
	factorizes parameters pretty-printing by reusing
	stream_pretty_representation_of_fn_parms.
	(is_pointer_type, is_reference_type, is_array_type): Take a
	boolean parameter to look through qualifiers.
	(is_void_pointer_type): Use const where it's due.
	(pointer_type_def::get_qualified_name): Use the new
	pointer_declaration_name in lieu of the old and removed
	get_name_of_pointer_to_type.
	(array_type_def::{get_pretty_representation, get_qualified_name}):
	Use the new array_declaration_name instead of the old and removed
	get_type_representation.
	(var_decl::get_pretty_representation): Use the new
	array_declaration_name and pointer_declaration_name.
	(function_decl::get_pretty_representation): Use the new
	add_outer_pointer_to_array_type_expr, and
	add_outer_pointer_to_array_type_expr function to support the
	proper syntax for function returning pointers and arrays.
	(function_decl::parameter::get_pretty_representation): Fix the
	pretty-printing of each function parameter.
	* tests/data/test-abicompat/test0-fn-changed-report-0.txt: Adjust.
	* tests/data/test-abicompat/test0-fn-changed-report-2.txt:
	Likewise.
	* tests/data/test-abicompat/test1-fn-removed-report-0.txt:
	Likewise.
	* tests/data/test-abicompat/test3-fn-removed-report-0.txt:
	Likewise.
	* tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt: Likewise.
	* tests/data/test-abidiff-exit/PR30048-test-report-0.txt: Likewise.
	* tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt: Likewise.
	* tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt: Likewise.
	* tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt: Likewise.
	* tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt: Likewise.
	* tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-fun-param-report.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-leaf-more-report.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-leaf-peeling-report.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-leaf-stats-report.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-net-change-report0.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test-net-change-report2.txt:
	Likewise.
	* tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt:
	Likewise.
	* tests/data/test-abidiff/test-PR18791-report0.txt: Likewise.
	* tests/data/test-abidiff/test-crc-report-0-1.txt: Likewise.
	* tests/data/test-abidiff/test-crc-report-1-0.txt: Likewise.
	* tests/data/test-abidiff/test-crc-report-1-2.txt: Likewise.
	* tests/data/test-annotate/test13-pr18894.so.abi: Likewise.
	* tests/data/test-annotate/test14-pr18893.so.abi: Likewise.
	* tests/data/test-annotate/test15-pr18892.so.abi: Likewise.
	* tests/data/test-annotate/test17-pr19027.so.abi: Likewise.
	* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Likewise.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Likewise.
	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi:
	Likewise.
	* tests/data/test-annotate/test21-pr19092.so.abi: Likewise.
	* tests/data/test-annotate/test7.so.abi: Likewise.
	* tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt:
	Likewise.
	* tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt:
	Likewise.
	* tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt:
	Likewise.
	* tests/data/test-diff-dwarf/test19-soname-report-0.txt: Likewise.
	* tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt:
	Likewise.
	* tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt:
	Likewise.
	* tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt:
	Likewise.
	* tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt:
	Likewise.
	* tests/data/test-diff-dwarf/test5-report.txt: Likewise.
	* tests/data/test-diff-filter/test-PR26739-2-report-0.txt:
	Likewise.
	* tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt:
	Likewise.
	* tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt:
	Likewise.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt:
	Likewise.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt:
	Likewise.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt:
	Likewise.
	* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt:
	Likewise.
	* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt:
	Likewise.
	* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt:
	Likewise.
	* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt:
	Likewise.
	* tests/data/test-diff-filter/test41-report-0.txt: Likewise.
	* tests/data/test-diff-filter/test6-report.txt: Likewise.
	* tests/data/test-diff-filter/test7-report.txt: Likewise.
	* tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt:
	Likewise.
	* tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt: Likewise.
	* tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt:
	Likewise.
	* tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-compat-4.4.18-3.el9.x86_64-report-1.txt:
	Likewise.
	* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt:
	Likewise.
	* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt:
	Likewise.
	* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt:
	Likewise.
	* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt:
	Likewise.
	* tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt:
	Likewise.
	* tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt: Likewise.
	* tests/data/test-diff-suppr/test0-type-suppr-report-0.txt:
	Likewise.
	* tests/data/test-diff-suppr/test0-type-suppr-report-3.txt:
	Likewise.
	* tests/data/test-diff-suppr/test0-type-suppr-report-5.txt:
	Likewise.
	* tests/data/test-diff-suppr/test0-type-suppr-report-7.txt:
	Likewise.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt:
	Likewise.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt:
	Likewise.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt:
	Likewise.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt:
	Likewise.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt:
	Likewise.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt:
	Likewise.
	* tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt:
	Likewise.
	* tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt:
	Likewise.
	* tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt:
	Likewise.
	* tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt:
	Likewise.
	* tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt:
	Likewise.
	* tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt:
	Likewise.
	* tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt:
	Likewise.
	* tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt:
	Likewise.
	* tests/data/test-diff-suppr/test30-report-0.txt: Likewise.
	* tests/data/test-diff-suppr/test32-report-0.txt: Likewise.
	* tests/data/test-diff-suppr/test32-report-1.txt: Likewise.
	* tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt:
	Likewise.
	* tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt:
	Likewise.
	* tests/data/test-read-ctf/test9.o.abi: Likewise.
	* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
	* tests/data/test-read-dwarf/test-libaaudio.so.abi: Likewise.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Likewise.
	* tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test7.so.abi: Likewise.
	* tests/data/test-read-dwarf/test7.so.hash.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 include/abg-fwd.h                             |   34 +-
 include/abg-ir.h                              |    3 -
 src/abg-ir.cc                                 | 1017 ++-
 .../test0-fn-changed-report-0.txt             |    4 +-
 .../test0-fn-changed-report-2.txt             |    4 +-
 .../test1-fn-removed-report-0.txt             |    2 +-
 .../test3-fn-removed-report-0.txt             |    2 +-
 .../PR30048-test-2-report-1.txt               |   78 +-
 .../PR30048-test-report-0.txt                 |   14 +-
 .../PR30329/PR30329-report-1.txt              |    4 +-
 .../libsdl/libsdl-1.2.60-1.2.64-report.txt    |   10 +-
 .../test1-ada-subrange-report-1.txt           |    4 +-
 .../test1-ada-subrange-report-2.txt           |    4 +-
 .../qualifier-typedef-array-report-1.txt      |    8 +-
 .../test-fun-param-report.txt                 |    2 +-
 .../test-ld-2.28-210.so--ld-2.28-211.so.txt   |    8 +-
 .../test-leaf-fun-type-report.txt             |    4 +-
 .../test-leaf-more-report.txt                 |    6 +-
 .../test-leaf-peeling-report.txt              |    4 +-
 .../test-leaf-stats-report.txt                |    2 +-
 .../test-net-change-report0.txt               |    6 +-
 .../test-net-change-report2.txt               |    6 +-
 .../test2-filtered-removed-fns-report0.txt    |    2 +-
 .../test-abidiff/test-PR18791-report0.txt     |    8 +-
 .../data/test-abidiff/test-crc-report-0-1.txt |    2 +-
 .../data/test-abidiff/test-crc-report-1-0.txt |    2 +-
 .../data/test-abidiff/test-crc-report-1-2.txt |    2 +-
 .../data/test-annotate/test13-pr18894.so.abi  |  306 +-
 .../data/test-annotate/test14-pr18893.so.abi  |  320 +-
 .../data/test-annotate/test15-pr18892.so.abi  | 2868 ++++-----
 .../data/test-annotate/test17-pr19027.so.abi  | 3100 ++++-----
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |   36 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi | 1616 ++---
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |   74 +-
 .../data/test-annotate/test21-pr19092.so.abi  |  274 +-
 tests/data/test-annotate/test7.so.abi         |   24 +-
 .../PR25058-liblttng-ctl-report-1.txt         |   40 +-
 .../test-23-diff-arch-report-0.txt            |    2 +-
 .../test18-alias-sym-report-0.txt             |    2 +-
 .../test19-soname-report-0.txt                |    2 +-
 .../test24-added-fn-parms-report-0.txt        |    2 +-
 .../test32-fnptr-changes-report-0.txt         |   20 +-
 .../test33-fnref-changes-report-0.txt         |   20 +-
 .../test41-PR20476-hidden-report-0.txt        |    2 +-
 tests/data/test-diff-dwarf/test5-report.txt   |    2 +-
 .../test-PR26739-2-report-0.txt               |    2 +-
 ...st26-qualified-redundant-node-report-0.txt |    2 +-
 ...st26-qualified-redundant-node-report-1.txt |    4 +-
 .../test30-pr18904-rvalueref-report0.txt      |   80 +-
 .../test30-pr18904-rvalueref-report1.txt      |   80 +-
 .../test30-pr18904-rvalueref-report2.txt      |   80 +-
 .../test31-pr18535-libstdc++-report-0.txt     |   18 +-
 .../test31-pr18535-libstdc++-report-1.txt     |   18 +-
 .../test35-pr18754-no-added-syms-report-0.txt |   62 +-
 .../test35-pr18754-no-added-syms-report-1.txt |   12 +-
 .../data/test-diff-filter/test41-report-0.txt |    2 +-
 tests/data/test-diff-filter/test6-report.txt  |    2 +-
 tests/data/test-diff-filter/test7-report.txt  |    2 +-
 .../gmp-6.x.x86_64-report-0.txt               |    4 +-
 .../test-diff-pkg-ctf/test-rpm-report-0.txt   |    2 +-
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |    4 +-
 .../PR24690/PR24690-report-0.txt              |   10 +-
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |    6 +-
 ...pt-compat-4.4.18-3.el9.x86_64-report-1.txt |    2 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |  124 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-3.txt |    2 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt |   32 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt |    8 +-
 .../test0-type-suppr-report-0.txt             |    2 +-
 .../test0-type-suppr-report-3.txt             |    2 +-
 .../test0-type-suppr-report-5.txt             |    2 +-
 .../test0-type-suppr-report-7.txt             |    2 +-
 .../test15-suppr-added-fn-report-0.txt        |    2 +-
 .../test15-suppr-added-fn-report-2.txt        |    2 +-
 .../test15-suppr-added-fn-report-5.txt        |    2 +-
 .../test16-suppr-removed-fn-report-0.txt      |    2 +-
 .../test16-suppr-removed-fn-report-3.txt      |    2 +-
 .../test16-suppr-removed-fn-report-5.txt      |    2 +-
 .../test27-add-aliased-function-report-0.txt  |    2 +-
 .../test27-add-aliased-function-report-3.txt  |    2 +-
 .../test27-add-aliased-function-report-4.txt  |    2 +-
 .../test28-add-aliased-function-report-0.txt  |    2 +-
 .../test28-add-aliased-function-report-1.txt  |    2 +-
 .../test28-add-aliased-function-report-2.txt  |    2 +-
 .../test28-add-aliased-function-report-4.txt  |    2 +-
 .../test28-add-aliased-function-report-5.txt  |    2 +-
 .../data/test-diff-suppr/test30-report-0.txt  |    2 +-
 .../data/test-diff-suppr/test32-report-0.txt  |    4 +-
 .../data/test-diff-suppr/test32-report-1.txt  |    2 +-
 ...t44-suppr-sym-name-not-regexp-report-1.txt |    2 +-
 ...-vte291-0.39.90-1.fc22.x86_64-report-0.txt |    2 +-
 tests/data/test-read-ctf/test9.o.abi          |   14 +-
 .../test-read-dwarf/PR22122-libftdc.so.abi    |  330 +-
 .../data/test-read-dwarf/PR25007-sdhci.ko.abi | 1366 ++--
 .../test-read-dwarf/test-libaaudio.so.abi     |   26 +-
 .../test-read-dwarf/test-libandroid.so.abi    | 1220 ++--
 .../test-read-dwarf/test11-pr18828.so.abi     | 5560 ++++++++---------
 .../test-read-dwarf/test12-pr18844.so.abi     | 1842 +++---
 .../test-read-dwarf/test13-pr18894.so.abi     |  164 +-
 .../test-read-dwarf/test14-pr18893.so.abi     |   20 +-
 .../test-read-dwarf/test15-pr18892.so.abi     | 1606 ++---
 .../test-read-dwarf/test16-pr18904.so.abi     |  644 +-
 .../test-read-dwarf/test17-pr19027.so.abi     | 2790 ++++-----
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |  950 +--
 .../test-read-dwarf/test21-pr19092.so.abi     |   48 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi |  562 +-
 tests/data/test-read-dwarf/test7.so.abi       |   14 +-
 tests/data/test-read-dwarf/test7.so.hash.abi  |   10 +-
 108 files changed, 14188 insertions(+), 13536 deletions(-)
  

Patch

diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index de5b72b0..3687d346 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -436,6 +436,9 @@  is_anonymous_type(const type_base*);
 bool
 is_anonymous_type(const type_base_sptr&);
 
+bool
+is_npaf_type(const type_base_sptr&);
+
 const type_decl*
 is_type_decl(const type_or_decl_base*);
 
@@ -536,26 +539,35 @@  is_compatible_with_class_type(const type_base_sptr&);
 class_decl_sptr
 is_compatible_with_class_type(const decl_base_sptr&);
 
-pointer_type_def*
-is_pointer_type(type_or_decl_base*);
-
 const pointer_type_def*
-is_pointer_type(const type_or_decl_base*);
+is_pointer_type(const type_or_decl_base*,
+		bool look_through_qualifiers=false);
+
+pointer_type_def_sptr
+is_pointer_type(const type_or_decl_base_sptr&,
+		bool look_through_qualifiers=false);
+
+pointer_type_def_sptr
+is_pointer_to_function_type(const type_base_sptr&);
+
+pointer_type_def_sptr
+is_pointer_to_array_type(const type_base_sptr&);
 
 pointer_type_def_sptr
-is_pointer_type(const type_or_decl_base_sptr&);
+is_pointer_to_npaf_type(const type_base_sptr&);
 
 bool
 is_typedef_ptr_or_ref_to_decl_only_class_or_union_type(const type_base* t);
 
 reference_type_def*
-is_reference_type(type_or_decl_base*);
+is_reference_type(type_or_decl_base*, bool look_through_qualifiers=false);
 
 const reference_type_def*
-is_reference_type(const type_or_decl_base*);
+is_reference_type(const type_or_decl_base*, bool look_through_qualifiers=false);
 
 reference_type_def_sptr
-is_reference_type(const type_or_decl_base_sptr&);
+is_reference_type(const type_or_decl_base_sptr&,
+		  bool look_through_qualifiers=false);
 
 const type_base*
 is_void_pointer_type(const type_base*);
@@ -799,10 +811,12 @@  const class_or_union_sptr
 data_member_has_anonymous_type(const var_decl_sptr& d);
 
 array_type_def*
-is_array_type(const type_or_decl_base* decl);
+is_array_type(const type_or_decl_base* decl,
+	      bool look_through_qualifiers = false);
 
 array_type_def_sptr
-is_array_type(const type_or_decl_base_sptr& decl);
+is_array_type(const type_or_decl_base_sptr& decl,
+	      bool look_through_qualifiers = false);
 
 array_type_def_sptr
 is_array_of_qualified_element(const type_base_sptr&);
diff --git a/include/abg-ir.h b/include/abg-ir.h
index 0cb378ad..8ed8d734 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -1485,9 +1485,6 @@  public:
   friend class_decl*
   is_class_type(const type_or_decl_base*);
 
-  friend pointer_type_def*
-  is_pointer_type(type_or_decl_base*);
-
   friend type_base*
   is_type(const type_or_decl_base*);
 
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 78a4dfe0..06cfe558 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -221,6 +221,49 @@  update_qualified_name(decl_base * d);
 static void
 update_qualified_name(decl_base_sptr d);
 
+static interned_string
+pointer_declaration_name(const type_base* ptr,
+			 const string& variable_name,
+			 bool qualified, bool internal);
+
+static interned_string
+pointer_declaration_name(const type_base_sptr& ptr,
+			 const string& variable_name,
+			 bool qualified, bool internal);
+
+static interned_string
+array_declaration_name(const array_type_def* array,
+		       const string& variable_name,
+		       bool qualified, bool internal);
+
+static interned_string
+array_declaration_name(const array_type_def_sptr& array,
+		       const string& variable_name,
+		       bool qualified, bool internal);
+
+static void
+stream_pretty_representation_of_fn_parms(const function_type& fn_type,
+					 ostream& o, bool qualified,
+					 bool internal);
+static string
+add_outer_pointer_to_fn_type_expr(const type_base* pointer_to_fn,
+				  const string& input, bool qualified,
+				  bool internal);
+
+static string
+add_outer_pointer_to_fn_type_expr(const type_base_sptr& pointer_to_fn,
+				  const string& input, bool qualified,
+				  bool internal);
+
+static string
+add_outer_pointer_to_array_type_expr(const type_base* pointer_to_ar,
+				     const string& input, bool qualified,
+				     bool internal);
+
+static string
+add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar,
+				     const string& input, bool qualified,
+				     bool internal);
 void
 push_composite_type_comparison_operands(const type_base& left,
 					const type_base& right);
@@ -9121,24 +9164,10 @@  get_function_type_name(const function_type& fn_type,
     : fn_type.get_return_type();
   const environment& env = fn_type.get_environment();
 
-  o <<  get_pretty_representation(return_type, internal);
-
-  o << " (";
-  type_base_sptr type;
-  for (function_type::parameters::const_iterator i =
-	 fn_type.get_parameters().begin();
-       i != fn_type.get_parameters().end();
-       ++i)
-    {
-      if (i != fn_type.get_parameters().begin())
-	o << ", ";
-      type = (*i)->get_type();
-      if (internal)
-	type = peel_typedef_type(type);
-      o << get_pretty_representation(type, internal);
-    }
-  o <<")";
-
+  o <<  get_pretty_representation(return_type, internal) << " ";
+  stream_pretty_representation_of_fn_parms(fn_type, o,
+					   /*qualified=*/true,
+					   internal);
   return env.intern(o.str());
 }
 
@@ -9236,28 +9265,10 @@  get_method_type_name(const method_type& fn_type,
   class_or_union_sptr class_type = fn_type.get_class_type();
   ABG_ASSERT(class_type);
 
-  o << " (" << class_type->get_qualified_name(internal) << "::*)"
-    << " (";
-
-  type_base_sptr type;
-  for (function_type::parameters::const_iterator i =
-	 fn_type.get_parameters().begin();
-       i != fn_type.get_parameters().end();
-       ++i)
-    {
-      if (i != fn_type.get_parameters().begin())
-	o << ", ";
-      type = (*i)->get_type();
-      if (internal)
-	type = peel_typedef_type(type);
-      if (*i)
-	o << type->get_cached_pretty_representation(internal);
-      else
-	// There are still some abixml files out there in which "void"
-	// can be expressed as an empty type.
-	o << "void";
-    }
-  o <<")";
+  o << " (" << class_type->get_qualified_name(internal) << "::*) ";
+  stream_pretty_representation_of_fn_parms(fn_type, o,
+					   /*qualified=*/true,
+					   internal);
 
   return env.intern(o.str());
 }
@@ -10563,6 +10574,21 @@  bool
 is_anonymous_type(const type_base_sptr& t)
 {return is_anonymous_type(t.get());}
 
+/// Test if a type is a neither a pointer, an array nor a function
+/// type.
+///
+/// @param t the type to consider.
+///
+/// @return true if the @p t is NOT a pointer, an array nor a
+/// function.
+bool
+is_npaf_type(const type_base_sptr& t)
+{
+  if (!(is_pointer_type(t) || is_array_type(t) || is_function_type(t)))
+    return true;
+  return false;
+}
+
 /// Test whether a type is a type_decl (a builtin type).
 ///
 /// @return the type_decl* for @t if it's type_decl, otherwise, return
@@ -11055,43 +11081,97 @@  is_union_type(const shared_ptr<type_or_decl_base>& t)
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// pointer_type_def.
+///
 /// @return the @ref pointer_type_def_sptr if @p t is a
 /// pointer_type_def, null otherwise.
-pointer_type_def*
-is_pointer_type(type_or_decl_base* t)
+const pointer_type_def*
+is_pointer_type(const type_or_decl_base* t,
+		bool look_through_qualifiers)
 {
   if (!t)
     return 0;
 
-  if (t->kind() & type_or_decl_base::POINTER_TYPE)
-    return reinterpret_cast<pointer_type_def*>
-      (const_cast<type_or_decl_base*>(t)->runtime_type_instance());
+  const type_base* type = is_type(t);
+  if (look_through_qualifiers)
+    type = peel_qualified_type(is_type(t));
 
-  return 0;
+  return dynamic_cast<pointer_type_def*>(const_cast<type_base*>(type));
 }
 
 /// Test whether a type is a pointer_type_def.
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// pointer_type_def.
+///
 /// @return the @ref pointer_type_def_sptr if @p t is a
 /// pointer_type_def, null otherwise.
-const pointer_type_def*
-is_pointer_type(const type_or_decl_base* t)
+pointer_type_def_sptr
+is_pointer_type(const type_or_decl_base_sptr &t,
+		bool look_through_qualifiers)
 {
-  return is_pointer_type(const_cast<type_or_decl_base*>(t));
+  type_base_sptr type = is_type(t);
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_pointer_cast<pointer_type_def>(type);
 }
 
-/// Test whether a type is a pointer_type_def.
+/// Test if a type is a pointer to function type.
 ///
-/// @param t the type to test.
+/// @param t the type to consider.
 ///
-/// @return the @ref pointer_type_def_sptr if @p t is a
-/// pointer_type_def, null otherwise.
+/// @return the @ref pointer_type_def_sptr iff @p t is a pointer to
+/// function type.
 pointer_type_def_sptr
-is_pointer_type(const type_or_decl_base_sptr &t)
-{return dynamic_pointer_cast<pointer_type_def>(t);}
+is_pointer_to_function_type(const type_base_sptr& t)
+{
+  if (pointer_type_def_sptr p = is_pointer_type(t))
+    {
+      if (is_function_type(p->get_pointed_to_type()))
+	return p;
+    }
+  return pointer_type_def_sptr();
+}
+
+/// Test if a type is a pointer to array type.
+///
+/// @param t the type to consider.
+///
+/// @return the pointer_type_def_sptr iff @p t is a pointer to array
+/// type.
+pointer_type_def_sptr
+is_pointer_to_array_type(const type_base_sptr& t)
+{
+  if (pointer_type_def_sptr p = is_pointer_type(t))
+    {
+      if (is_array_type(p->get_pointed_to_type()))
+	return p;
+    }
+  return pointer_type_def_sptr();
+}
 
+/// Test if we are looking at a pointer to a
+/// neither-a-pointer-to-an-array-nor-a-function type.
+///
+/// @param t the type to consider.
+///
+/// @return the @ref pointer_type_def_sptr type iff @p t is a
+/// neither-a-pointer-an-array-nor-a-function type.
+pointer_type_def_sptr
+is_pointer_to_npaf_type(const type_base_sptr& t)
+{
+  if (pointer_type_def_sptr p = is_pointer_type(t))
+    {
+      if (is_npaf_type(p->get_pointed_to_type()))
+	return p;
+    }
+  return pointer_type_def_sptr();
+}
 
 /// Test if a type is a typedef, pointer or reference to a decl-only
 /// class/union.
@@ -11119,31 +11199,65 @@  is_typedef_ptr_or_ref_to_decl_only_class_or_union_type(const type_base* t)
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// reference_type_def.
+///
 /// @return the @ref reference_type_def_sptr if @p t is a
 /// reference_type_def, null otherwise.
 reference_type_def*
-is_reference_type(type_or_decl_base* t)
-{return dynamic_cast<reference_type_def*>(t);}
+is_reference_type(type_or_decl_base* t,
+		  bool look_through_qualifiers)
+{
+  const type_base* type = is_type(t);
+  if (!type)
+    return nullptr;
+
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_cast<reference_type_def*>(const_cast<type_base*>(type));
+}
 
 /// Test whether a type is a reference_type_def.
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// reference_type_def.
+///
 /// @return the @ref reference_type_def_sptr if @p t is a
 /// reference_type_def, null otherwise.
 const reference_type_def*
-is_reference_type(const type_or_decl_base* t)
-{return dynamic_cast<const reference_type_def*>(t);}
+is_reference_type(const type_or_decl_base* t,
+		  bool look_through_qualifiers)
+{
+  const type_base* type = is_type(t);
+
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_cast<const reference_type_def*>(type);
+}
 
 /// Test whether a type is a reference_type_def.
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// reference_type_def.
+///
 /// @return the @ref reference_type_def_sptr if @p t is a
 /// reference_type_def, null otherwise.
 reference_type_def_sptr
-is_reference_type(const type_or_decl_base_sptr& t)
-{return dynamic_pointer_cast<reference_type_def>(t);}
+is_reference_type(const type_or_decl_base_sptr& t,
+		  bool look_through_qualifiers)
+{
+  type_base_sptr type = is_type(t);
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_pointer_cast<reference_type_def>(type);
+}
 
 /// Test if a type is equivalent to a pointer to void type.
 ///
@@ -11226,7 +11340,7 @@  is_void_pointer_type(const type_base_sptr& t)
   if (t->get_environment().get_void_pointer_type().get() == t.get())
     return t;
 
-  pointer_type_def* ptr = is_pointer_type(t.get());
+  const pointer_type_def* ptr = is_pointer_type(t.get());
   if (!ptr)
     return nil;
 
@@ -11528,8 +11642,15 @@  is_function_template_pattern(const shared_ptr<decl_base> decl)
 ///
 /// @return true iff @p type is an array_type_def.
 array_type_def*
-is_array_type(const type_or_decl_base* type)
-{return dynamic_cast<array_type_def*>(const_cast<type_or_decl_base*>(type));}
+is_array_type(const type_or_decl_base* type,
+	      bool look_through_qualifiers)
+{
+  const type_base* t = is_type(type);
+
+  if (look_through_qualifiers)
+    t = peel_qualified_type(t);
+  return dynamic_cast<array_type_def*>(const_cast<type_base*>(t));
+}
 
 /// Test if a type is an array_type_def.
 ///
@@ -11537,8 +11658,15 @@  is_array_type(const type_or_decl_base* type)
 ///
 /// @return true iff @p type is an array_type_def.
 array_type_def_sptr
-is_array_type(const type_or_decl_base_sptr& type)
-{return dynamic_pointer_cast<array_type_def>(type);}
+is_array_type(const type_or_decl_base_sptr& type,
+	      bool look_through_qualifiers)
+{
+  type_base_sptr t = is_type(type);
+
+  if (look_through_qualifiers)
+    t = peel_qualified_type(t);
+  return dynamic_pointer_cast<array_type_def>(t);
+}
 
 /// Tests if the element of a given array is a qualified type.
 ///
@@ -17419,13 +17547,14 @@  pointer_type_def::get_qualified_name(bool internal) const
 	  if (priv_->internal_qualified_name_.empty())
 	    if (pointed_to_type)
 	      priv_->internal_qualified_name_ =
-		get_name_of_pointer_to_type(*pointed_to_type,
-					    /*qualified_name=*/
-					    is_typedef(pointed_to_type)
-					    ? false
-					    : true,
-					    /*internal=*/true);
-	  return priv_->internal_qualified_name_;
+		pointer_declaration_name(this,
+					 /*variable_name=*/"",
+					 /*qualified_name=*/
+					 is_typedef(pointed_to_type)
+					 ? false
+					 : true,
+					 /*internal=*/true);
+		return priv_->internal_qualified_name_;
 	}
       else
 	{
@@ -17435,12 +17564,13 @@  pointer_type_def::get_qualified_name(bool internal) const
 	  // function.
 	  if (pointed_to_type)
 	    priv_->temp_internal_qualified_name_ =
-	      get_name_of_pointer_to_type(*pointed_to_type,
-					  /*qualified_name=*/
-					  is_typedef(pointed_to_type)
-					  ? false
-					  : true,
-					  /*internal=*/true);
+		pointer_declaration_name(this,
+					 /*variable_name=*/"",
+					 /*qualified_name=*/
+					 is_typedef(pointed_to_type)
+					 ? false
+					 : true,
+					 /*internal=*/true);
 	  return priv_->temp_internal_qualified_name_;
 	}
     }
@@ -17450,9 +17580,10 @@  pointer_type_def::get_qualified_name(bool internal) const
 	{
 	  if (decl_base::peek_qualified_name().empty())
 	    set_qualified_name
-	      (get_name_of_pointer_to_type(*pointed_to_type,
-					   /*qualified_name=*/true,
-					   /*internal=*/false));
+	      (pointer_declaration_name(this,
+					/*variable_name=*/"",
+					/*qualified_name=*/true,
+					/*internal=*/false));
 	  return decl_base::peek_qualified_name();
 	}
       else
@@ -17463,9 +17594,10 @@  pointer_type_def::get_qualified_name(bool internal) const
 	  // function.
 	  if (pointed_to_type)
 	    set_qualified_name
-	      (get_name_of_pointer_to_type(*pointed_to_type,
-					   /*qualified_name=*/true,
-					   /*internal=*/false));
+	      (pointer_declaration_name(this,
+					/*variable_name=*/"",
+					/*qualified_name=*/true,
+					/*internal=*/false));
 	  return decl_base::peek_qualified_name();
 	}
     }
@@ -18598,48 +18730,6 @@  array_type_def::get_subrange_representation() const
   return r;
 }
 
-/// Get the string representation of an @ref array_type_def.
-///
-/// @param a the array type to consider.
-///
-/// @param internal set to true if the call is intended for an
-/// internal use (for technical use inside the library itself), false
-/// otherwise.  If you don't know what this is for, then set it to
-/// false.
-static string
-get_type_representation(const array_type_def& a, bool internal)
-{
-  type_base_sptr e_type = a.get_element_type();
-  decl_base_sptr d = get_type_declaration(e_type);
-  string r;
-
-  if (is_ada_language(a.get_language()))
-    {
-      std::ostringstream o;
-      o << "array ("
-	<< a.get_subrange_representation()
-	<< ") of "
-	<<  e_type ? e_type->get_pretty_representation(internal):string("void");
-    }
-  else
-    {
-      if (internal)
-	r = (e_type
-	     ? get_type_name(e_type,
-			     /*qualified=*/true,
-			     /*internal=*/true)
-	     : string("void"))
-	  + a.get_subrange_representation();
-      else
-	r = (e_type
-	     ? get_type_name(e_type, /*qualified=*/true, /*internal=*/false)
-	     : string("void"))
-	  + a.get_subrange_representation();
-    }
-
-  return r;
-}
-
 /// Get the pretty representation of the current instance of @ref
 /// array_type_def.
 ///
@@ -18660,8 +18750,11 @@  get_type_representation(const array_type_def& a, bool internal)
 /// @return the pretty representation of the ABI artifact.
 string
 array_type_def::get_pretty_representation(bool internal,
-					  bool /*qualified_name*/) const
-{return get_type_representation(*this, internal);}
+					  bool qualified_name) const
+{
+  return array_declaration_name(this, /*variable_name=*/"",
+				qualified_name, internal);
+}
 
 /// Compares two instances of @ref array_type_def.
 ///
@@ -18891,22 +18984,22 @@  array_type_def::get_qualified_name(interned_string& qn, bool internal) const
 const interned_string&
 array_type_def::get_qualified_name(bool internal) const
 {
-  const environment& env = get_environment();
-
-
   if (internal)
     {
       if (get_canonical_type())
 	{
 	  if (priv_->internal_qualified_name_.empty())
 	    priv_->internal_qualified_name_ =
-	      env.intern(get_type_representation(*this, /*internal=*/true));
+	      array_declaration_name(this, /*variable_name=*/"",
+				     /*qualified=*/false,
+				     /*internal=*/true);
 	  return priv_->internal_qualified_name_;
 	}
       else
 	{
 	  priv_->temp_internal_qualified_name_ =
-	    env.intern(get_type_representation(*this, /*internal=*/true));
+	    array_declaration_name(this, /*variable_name=*/"",
+				   /*qualified*/false, /*internal*/true);
 	  return priv_->temp_internal_qualified_name_;
 	}
     }
@@ -18915,15 +19008,18 @@  array_type_def::get_qualified_name(bool internal) const
       if (get_canonical_type())
 	{
 	  if (decl_base::peek_qualified_name().empty())
-	    set_qualified_name(env.intern(get_type_representation
-					   (*this, /*internal=*/false)));
+	    set_qualified_name(array_declaration_name(this,
+						      /*variable_name=*/"",
+						      /*qualified=*/false,
+						      /*internal=*/false));
 	  return decl_base::peek_qualified_name();
 	}
       else
 	{
-	  set_temporary_qualified_name(env.intern(get_type_representation
-						   (*this,
-						    /*internal=*/false)));
+	  set_temporary_qualified_name
+	    (array_declaration_name(this, /*variable_name=*/"",
+				    /*qualified=*/false,
+				    /*internal=*/false));
 	  return decl_base::peek_temporary_qualified_name();
 	}
     }
@@ -20433,7 +20529,10 @@  var_decl::get_pretty_representation(bool internal, bool qualified_name) const
     if (scope->get_is_anonymous())
       member_of_anonymous_class = true;
 
-  if (array_type_def_sptr t = is_array_type(get_type()))
+  type_base_sptr type = get_type();
+  if (is_array_type(type, /*look_through_qualifiers=*/true)
+      || is_pointer_type(type, /*look_through_qualifiers=*/true)
+      || is_reference_type(type, /*look_through_qualifiers=*/true))
     {
       string name;
       if (member_of_anonymous_class || !qualified_name)
@@ -20441,12 +20540,22 @@  var_decl::get_pretty_representation(bool internal, bool qualified_name) const
       else
 	name = get_qualified_name(internal);
 
-      type_base_sptr et = t->get_element_type();
-      ABG_ASSERT(et);
-      decl_base_sptr decl = get_type_declaration(et);
-      ABG_ASSERT(decl);
-      result += decl->get_qualified_name(internal)
-	+ " " + name + t->get_subrange_representation();
+      if (qualified_type_def_sptr q = is_qualified_type(type))
+	{
+	  string quals_repr =
+	    get_string_representation_of_cv_quals(q->get_cv_quals());
+	  if (!quals_repr.empty())
+	    name = quals_repr + " " + name;
+	  type = peel_qualified_type(type);
+	}
+
+      name = string(" ") + name;
+      if (array_type_def_sptr t = is_array_type(type))
+	result += array_declaration_name(t, name, qualified_name, internal);
+      else if (pointer_type_def_sptr t = is_pointer_type(type))
+	result += pointer_declaration_name(t, name, qualified_name, internal);
+      else if (reference_type_def_sptr t = is_reference_type(type))
+	result += pointer_declaration_name(t, name, qualified_name, internal);
     }
   else
     {
@@ -21425,32 +21534,48 @@  function_decl::get_pretty_representation(bool internal,
   const method_decl* mem_fn =
     dynamic_cast<const method_decl*>(this);
 
-  string result = mem_fn ? "method ": "function ";
+  string fn_prefix = mem_fn ? "method ": "function ";
+  string result;
 
   if (mem_fn
       && is_member_function(mem_fn)
       && get_member_function_is_virtual(mem_fn))
-    result += "virtual ";
+    fn_prefix += "virtual ";
 
-  decl_base_sptr type;
+  decl_base_sptr return_type;
   if ((mem_fn
        && is_member_function(mem_fn)
        && (get_member_function_is_dtor(*mem_fn)
 	   || get_member_function_is_ctor(*mem_fn))))
     /*cdtors do not have return types.  */;
   else
-    type = mem_fn
+    return_type = mem_fn
       ? get_type_declaration(mem_fn->get_type()->get_return_type())
       : get_type_declaration(get_type()->get_return_type());
 
-  if (type)
-    result += get_type_name(is_type(type).get(),
-			    qualified_name,
-			    internal) + " ";
-
-  result += get_pretty_representation_of_declarator(internal);
+  result = get_pretty_representation_of_declarator(internal);
+  if (return_type)
+    {
+      if (is_npaf_type(is_type(return_type))
+	  || !(is_pointer_to_function_type(is_type(return_type))
+	       || is_pointer_to_array_type(is_type(return_type))))
+	result = get_type_name(is_type(return_type).get(), qualified_name,
+			       internal) + " " + result;
+      else if (pointer_type_def_sptr p =
+	       is_pointer_to_function_type(is_type(return_type)))
+	result = add_outer_pointer_to_fn_type_expr(p, result,
+						   /*qualified=*/true,
+						   internal);
+      else if(pointer_type_def_sptr p =
+	      is_pointer_to_array_type(is_type(return_type)))
+	result = add_outer_pointer_to_array_type_expr(p, result,
+						      qualified_name,
+						      internal);
+      else
+	ABG_ASSERT_NOT_REACHED;
+    }
 
-  return result;
+  return fn_prefix + result;
 }
 
 /// Compute and return the pretty representation for the part of the
@@ -21486,35 +21611,12 @@  function_decl::get_pretty_representation_of_declarator (bool internal) const
   else
     result += get_qualified_name();
 
-  result += "(";
-
-  parameters::const_iterator i = get_parameters().begin(),
-    end = get_parameters().end();
-
-  // Skip the first parameter if this is a method.
-  if (mem_fn && i != end)
-    ++i;
-  parameter_sptr parm;
-  parameter_sptr first_parm;
-  if (i != end)
-    first_parm = *i;
-  for (; i != end; ++i)
-    {
-      parm = *i;
-      if (parm.get() != first_parm.get())
-	result += ", ";
-      if (parm->get_variadic_marker()
-	  || get_environment().is_variadic_parameter_type(parm->get_type()))
-	result += "...";
-      else
-	{
-	  type_base_sptr type = parm->get_type();
-	  if (internal)
-	    type = peel_typedef_type(type);
-	  result += get_type_name(type, /*qualified=*/true, internal);
-	}
-    }
-  result += ")";
+  std::ostringstream fn_parms;
+  stream_pretty_representation_of_fn_parms(*get_type(),
+					   fn_parms,
+					   /*qualified=*/true,
+					   internal);
+  result += fn_parms.str();
 
   if (mem_fn
       &&((is_member_function(mem_fn) && get_member_function_is_const(*mem_fn))
@@ -22326,7 +22428,7 @@  function_decl::parameter::get_qualified_name(interned_string& qualified_name,
 /// function parameter.
 string
 function_decl::parameter::get_pretty_representation(bool internal,
-						    bool /*qualified_name*/) const
+						    bool qualified_name) const
 {
   const environment& env = get_environment();
 
@@ -22337,7 +22439,7 @@  function_decl::parameter::get_pretty_representation(bool internal,
   else if (env.is_variadic_parameter_type(t))
     type_repr = "...";
   else
-    type_repr = ir::get_pretty_representation(t, internal);
+    type_repr = ir::get_type_name(t, qualified_name, internal);
 
   string result = type_repr;
   string parm_name = get_name_id();
@@ -27775,6 +27877,545 @@  find_last_data_member_matching_regexp(const class_or_union& t,
   return var_decl_sptr();
 }
 
+/// Emit the pretty representation of the parameters of a function
+/// type.
+///
+/// @param fn_type the function type to consider.
+///
+/// @param o the output stream to emit the pretty representation to.
+///
+/// @param qualified if true, emit fully qualified names.
+///
+/// @param internal if true, then the result is to be used for the
+/// purpose of type canonicalization.
+static void
+stream_pretty_representation_of_fn_parms(const function_type& fn_type,
+					 ostream& o, bool qualified,
+					 bool internal)
+{
+  o << "(";
+  if (fn_type.get_parameters().empty())
+    o << "void";
+  else
+    {
+      type_base_sptr type;
+      auto end = fn_type.get_parameters().end();
+      auto first_parm = fn_type.get_first_non_implicit_parm();
+      function_decl::parameter_sptr parm;
+      const environment& env = fn_type.get_environment();
+      for (auto i = fn_type.get_first_non_implicit_parm(); i != end; ++i)
+	{
+	  if (i != first_parm)
+	    o << ", ";
+	  parm = *i;
+	  type = parm->get_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 << ")";
+}
+
+/// When constructing the name of a pointer to function type, add the
+/// return type to the left of the existing type identifier, and the
+/// parameters declarator to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "an array of pointer to function taking a char parameter and
+///    returning an int".
+///
+/// It's going to look like:
+///
+///   int(*a[])(char);
+///
+/// Suppose the caller of this function started to emit the inner
+/// "a[]" part of the expression already.  It thus calls this
+/// function with that input "a[]" part.  We consider that "a[]" as
+/// the "type identifier".
+///
+/// So the inner_expr is going to be "(*a[])".
+///
+/// The left_expr part is "int".  The right_expr part is "(char)".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to function type expression".
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to function type to consider.
+///
+/// @param input the type-id to use as the inner expression of the
+/// overall pointer-to-function type expression
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to function type.
+static string
+add_outer_pointer_to_fn_type_expr(const type_base* p,
+				  const string& input,
+				  bool qualified, bool internal)
+{
+  if (!p)
+    return "";
+
+  function_type_sptr pointed_to_fn;
+  string star_or_ref;
+
+  if (const pointer_type_def* ptr = is_pointer_type(p))
+    {
+      pointed_to_fn = is_function_type(ptr->get_pointed_to_type());
+      star_or_ref= "*";
+    }
+  else if (const reference_type_def* ref = is_reference_type(p))
+    {
+      star_or_ref = "&";
+      pointed_to_fn = is_function_type(ref->get_pointed_to_type());
+    }
+
+  if (!pointed_to_fn)
+    return "";
+
+  std::ostringstream left, right, inner;
+
+  inner <<  "(" << star_or_ref  << input << ")";
+
+  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();
+
+  string result;
+
+  if (is_npaf_type(return_type)
+      || !(is_pointer_to_function_type(return_type)
+	   || is_pointer_to_array_type(return_type)))
+    {
+      if (return_type)
+	left << get_type_name(return_type, qualified, internal);
+      result = left.str() + " " + inner.str() + right.str();
+    }
+  else if (pointer_type_def_sptr p = is_pointer_to_function_type(return_type))
+    {
+      string inner_string = inner.str() + right.str();
+      result = add_outer_pointer_to_fn_type_expr(p, inner_string,
+						 qualified, internal);
+    }
+  else if (pointer_type_def_sptr p = is_pointer_to_array_type(return_type))
+    {
+      string inner_string = inner.str() + right.str();
+      result = add_outer_pointer_to_array_type_expr(p, inner_string,
+						    qualified, internal);
+    }
+  else
+    ABG_ASSERT_NOT_REACHED;
+
+  return result;
+}
+
+/// When constructing the name of a pointer to function type, add the
+/// return type to the left of the existing type identifier, and the
+/// parameters declarator to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "an array of pointer to function taking a char parameter and
+///    returning an int".
+///
+/// It's going to look like:
+///
+///   int(*a[])(char);
+///
+/// Suppose the caller of this function started to emit the inner
+/// "a[]" part of the expression already.  It thus calls this
+/// function with that input "a[]" part.  We consider that "a[]" as
+/// the "type identifier".
+///
+/// So the inner_expr is going to be "(*a[])".
+///
+/// The left_expr part is "int".  The right_expr part is "(char)".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to function type expression".
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to function type to consider.
+///
+/// @param input the type-id to use as the inner expression of the
+/// overall pointer-to-function type expression
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to function type.
+static string
+add_outer_pointer_to_fn_type_expr(const type_base_sptr& p,
+				  const string& input,
+				  bool qualified, bool internal)
+{return add_outer_pointer_to_fn_type_expr(p.get(), input, qualified, internal);}
+
+/// When constructing the name of a pointer to array type, add the
+/// array element type type to the left of the existing type
+/// identifier, and the array declarator part to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "a pointer to an array of int".
+///
+/// It's going to look like:
+///
+///   int(*foo)[];
+///
+/// Suppose the caller of this function started to emit the inner
+/// "foo" part of the expression already.  It thus calls this function
+/// with that input "foo" part.  We consider that "foo" as the "type
+/// identifier".
+///
+/// So we are passed an input string that is "foo" and it's going to
+/// be turned into the inner_expr part, which is going to be "(*foo)".
+///
+/// The left_expr part is "int".  The right_expr part is "[]".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to array type expression".
+///
+/// The model of this function was taken from the article "Reading C
+/// type declaration", from Steve Friedl at
+/// http://unixwiz.net/techtips/reading-cdecl.html.
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to array type to consider.
+///
+/// @param input the type-id to start from as the inner part of the
+/// final type name.
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to array type.
+static string
+add_outer_pointer_to_array_type_expr(const type_base* p,
+				     const string& input, bool qualified,
+				     bool internal)
+{
+  if (!p)
+    return "";
+
+  string star_or_ref;
+  type_base_sptr pointed_to_type;
+
+  if (const pointer_type_def *ptr = is_pointer_type(p))
+    {
+      pointed_to_type = ptr->get_pointed_to_type();
+      star_or_ref = "*";
+    }
+  else if (const reference_type_def *ref = is_reference_type(p))
+    {
+      pointed_to_type = ref->get_pointed_to_type();
+      star_or_ref = "&";
+    }
+
+  array_type_def_sptr array = is_array_type(pointed_to_type);
+  if (!array)
+    return "";
+
+  std::ostringstream left, right, inner;
+  inner <<  "(" << star_or_ref  << input << ")";
+  right << array->get_subrange_representation();
+  string result;
+
+  type_base_sptr array_element_type = array->get_element_type();
+
+  if (is_npaf_type(array_element_type)
+      || !(is_pointer_to_function_type(array_element_type)
+	   || is_pointer_to_array_type(array_element_type)))
+    {
+      left << get_type_name(array_element_type, qualified, internal);
+      result = left.str() + inner.str() + right.str();
+    }
+  else if (pointer_type_def_sptr p =
+	   is_pointer_to_function_type(array_element_type))
+    {
+      string r = inner.str() + right.str();
+      result = add_outer_pointer_to_fn_type_expr(p, r, qualified, internal);
+    }
+  else if (pointer_type_def_sptr p =
+	   is_pointer_to_array_type(array_element_type))
+    {
+      string inner_string = inner.str() + right.str();
+      result = add_outer_pointer_to_array_type_expr(p, inner_string,
+						    qualified, internal);
+    }
+  else
+    ABG_ASSERT_NOT_REACHED;
+
+  return result;
+}
+
+/// When constructing the name of a pointer to array type, add the
+/// array element type type to the left of the existing type
+/// identifier, and the array declarator part to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "a pointer to an array of int".
+///
+/// It's going to look like:
+///
+///   int(*foo)[];
+///
+/// Suppose the caller of this function started to emit the inner
+/// "foo" part of the expression already.  It thus calls this function
+/// with that input "foo" part.  We consider that "foo" as the "type
+/// identifier".
+///
+/// So we are passed an input string that is "foo" and it's going to
+/// be turned into the inner_expr part, which is going to be "(*foo)".
+///
+/// The left_expr part is "int".  The right_expr part is "[]".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to array type expression".
+///
+/// The model of this function was taken from the article "Reading C
+/// type declaration", from Steve Friedl at
+/// http://unixwiz.net/techtips/reading-cdecl.html.
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to array type to consider.
+///
+/// @param input the type-id to start from as the inner part of the
+/// final type name.
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to array type.
+static string
+add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar,
+				     const string& input, bool qualified,
+				     bool internal)
+{return add_outer_pointer_to_array_type_expr(pointer_to_ar.get(),
+					     input, qualified, internal);}
+
+/// Emit the name of a pointer declaration.
+///
+/// @param the pointer to consider.
+///
+/// @param idname the name of the variable that has @p as a type or
+/// the id of the type.  If it's empty then the resulting name is
+/// going to be the abstract name of the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+pointer_declaration_name(const type_base* ptr,
+			 const string& idname,
+			 bool qualified, bool internal)
+{
+  if (!ptr)
+    return interned_string();
+
+  type_base_sptr pointed_to_type;
+  string star_or_ref;
+  if (const pointer_type_def* p = is_pointer_type(ptr))
+    {
+      pointed_to_type = p->get_pointed_to_type();
+      star_or_ref = "*";
+    }
+  else if (const reference_type_def* p = is_reference_type(ptr))
+    {
+      pointed_to_type = p->get_pointed_to_type();
+      star_or_ref = "&";
+    }
+
+  if (!pointed_to_type)
+    return interned_string();
+
+  string result;
+  if (is_npaf_type(pointed_to_type)
+      || !(is_function_type(pointed_to_type)
+	   || is_array_type(pointed_to_type)))
+    {
+      result = get_type_name(pointed_to_type,
+			     qualified,
+			     internal)
+	+ star_or_ref;
+
+      if (!idname.empty())
+	result += idname;
+    }
+  else
+    {
+      // derived type
+      if (is_function_type(pointed_to_type))
+	result = add_outer_pointer_to_fn_type_expr(ptr, idname,
+						   qualified, internal);
+      else if (is_array_type(pointed_to_type))
+	result = add_outer_pointer_to_array_type_expr(ptr, idname,
+						      qualified, internal);
+      else
+	ABG_ASSERT_NOT_REACHED;
+    }
+  return ptr->get_environment().intern(result);
+}
+
+
+/// Emit the name of a pointer declaration.
+///
+/// @param the pointer to consider.
+///
+/// @param the name of the variable that has @p as a type.  If it's
+/// empty then the resulting name is going to be the abstract name of
+/// the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+pointer_declaration_name(const type_base_sptr& ptr,
+			 const string& variable_name,
+			 bool qualified, bool internal)
+{return pointer_declaration_name(ptr.get(), variable_name,
+				 qualified, internal);}
+
+/// Emit the name of a array declaration.
+///
+/// @param the array to consider.
+///
+/// @param the name of the variable that has @p as a type.  If it's
+/// empty then the resulting name is going to be the abstract name of
+/// the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+array_declaration_name(const array_type_def* array,
+		       const string& variable_name,
+		       bool qualified, bool internal)
+{
+  if (!array)
+    return interned_string();
+
+  type_base_sptr e_type = array->get_element_type();
+  string e_type_repr =
+    (e_type
+     ? get_type_name(e_type, qualified, internal)
+     : string("void"));
+
+  string result;
+  if (is_ada_language(array->get_language()))
+    {
+      std::ostringstream o;
+      if (!variable_name.empty())
+	o << variable_name << " is ";
+      o << "array ("
+	<< array->get_subrange_representation()
+	<< ") of " << e_type_repr;
+      result = o.str();
+    }
+  else
+    {
+      if (is_npaf_type(e_type)
+	  || !(is_pointer_to_function_type(e_type)
+	       || is_pointer_to_array_type(e_type)))
+	{
+	  result = e_type_repr;
+	  if (!variable_name.empty())
+	    result += variable_name;
+	  result += array->get_subrange_representation();
+	}
+      else if (pointer_type_def_sptr p = is_pointer_type(e_type))
+	{
+	  string s = variable_name + array->get_subrange_representation();
+	  result = pointer_declaration_name(p, s, qualified, internal);
+	}
+      else
+	ABG_ASSERT_NOT_REACHED;
+    }
+  return array->get_environment().intern(result);
+}
+
+/// Emit the name of a array declaration.
+///
+/// @param the array to consider.
+///
+/// @param the name of the variable that has @p as a type.  If it's
+/// empty then the resulting name is going to be the abstract name of
+/// the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+array_declaration_name(const array_type_def_sptr& array,
+		       const string& variable_name,
+		       bool qualified, bool internal)
+{return array_declaration_name(array.get(), variable_name,
+			       qualified, internal);}
 bool
 ir_traversable_base::traverse(ir_node_visitor&)
 {return true;}
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-0.txt b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
index 7e6286dc..f7ef97bb 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
@@ -4,14 +4,14 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function libapp::S0* libapp::create_s0()' has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0(void)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char m1', at offset 32 (in bits)
 
-  [C] 'function libapp::S1* libapp::create_s1()' has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1(void)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1':
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-2.txt b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
index e2e85b44..70fba89e 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
@@ -4,14 +4,14 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function libapp::S0* libapp::create_s0()' at test0-fn-changed-libapp-v0.cc:47:1 has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0(void)' at test0-fn-changed-libapp-v0.cc:47:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0' at test0-fn-changed-libapp-v1.cc:10:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:13:1
 
-  [C] 'function libapp::S1* libapp::create_s1()' at test0-fn-changed-libapp-v0.cc:55:1 has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1(void)' at test0-fn-changed-libapp-v0.cc:55:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1' at test0-fn-changed-libapp-v1.cc:21:1:
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test1-fn-removed-report-0.txt b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
index e957129f..5165960f 100644
--- a/tests/data/test-abicompat/test1-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
@@ -4,5 +4,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void fun2()'    {_Z4fun2v}
+  [D] 'function void fun2(void)'    {_Z4fun2v}
 
diff --git a/tests/data/test-abicompat/test3-fn-removed-report-0.txt b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
index e8eaf4b3..a58fef7b 100644
--- a/tests/data/test-abicompat/test3-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
@@ -4,5 +4,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
+  [D] 'function void _internal_fun1(void)'    {_Z4fun1v@@VERSION_1.0}
 
diff --git a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
index 2650b5a0..7bbbc2e2 100644
--- a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
+++ b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
@@ -3,22 +3,22 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 7 functions with some indirect sub-type change:
 
-  [C] 'function int[7]* N()' at PR30048-test-2-v0.cc:62:1 has some indirect sub-type changes:
+  [C] 'function int(*N(void))[7]' at PR30048-test-2-v0.cc:62:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'int[7]*' to 'int'
+      entity changed from 'int(*)[7]' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function int* O()' at PR30048-test-2-v0.cc:64:1 has some indirect sub-type changes:
+  [C] 'function int* O(void)' at PR30048-test-2-v0.cc:64:1 has some indirect sub-type changes:
     return type changed:
       entity changed from 'int*' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function int ()* P()' at PR30048-test-2-v0.cc:67:1 has some indirect sub-type changes:
+  [C] 'function int (*P(void))(void)' at PR30048-test-2-v0.cc:67:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'int ()*' to 'int'
+      entity changed from 'int (*)(void)' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function amusement* fun()' at PR30048-test-2-v0.cc:57:1 has some indirect sub-type changes:
+  [C] 'function amusement* fun(void)' at PR30048-test-2-v0.cc:57:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct amusement' at PR30048-test-2-v1.cc:1:1:
         type size changed from 6528 to 768 (in bits)
@@ -30,8 +30,8 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'int*' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 256 to 32 (in bits) (by -224 bits)
-          type of 'int ()* C' changed:
-            entity changed from 'int ()*' to 'int'
+          type of 'int (* C)(void)' changed:
+            entity changed from 'int (*)(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 320 to 64 (in bits) (by -256 bits)
           type of 'int D[7][7]' changed:
@@ -42,32 +42,32 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'int*[7]' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 1984 to 128 (in bits) (by -1856 bits)
-          type of 'int ()* F[7]' changed:
-            entity changed from 'int ()*[7]' to 'int'
+          type of 'int (* F[7])(void)' changed:
+            entity changed from 'int (*[7])(void)' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 2432 to 160 (in bits) (by -2272 bits)
-          type of 'int[7]* G' changed:
-            entity changed from 'int[7]*' to 'int'
+          type of 'int(* G)[7]' changed:
+            entity changed from 'int(*)[7]' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 2880 to 192 (in bits) (by -2688 bits)
           type of 'int** H' changed:
             entity changed from 'int**' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 2944 to 224 (in bits) (by -2720 bits)
-          type of 'int ()* I' changed:
-            entity changed from 'int ()*' to 'int'
+          type of 'int (* I)(void)' changed:
+            entity changed from 'int (*)(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3008 to 256 (in bits) (by -2752 bits)
-          type of 'int[7]* ()* J' changed:
-            entity changed from 'int[7]* ()*' to 'int'
+          type of 'int(*(* J)(void))[7]' changed:
+            entity changed from 'int(*(*)(void))[7]' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3072 to 288 (in bits) (by -2784 bits)
-          type of 'int* ()* K' changed:
-            entity changed from 'int* ()*' to 'int'
+          type of 'int* (* K)(void)' changed:
+            entity changed from 'int* (*)(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3136 to 320 (in bits) (by -2816 bits)
-          type of 'int ()* ()* L' changed:
-            entity changed from 'int ()* ()*' to 'int'
+          type of 'int (*(* L)(void))(void)' changed:
+            entity changed from 'int (*(*)(void))(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3200 to 352 (in bits) (by -2848 bits)
           type of 'volatile int a[7]' changed:
@@ -78,8 +78,8 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'volatile int* const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3520 to 416 (in bits) (by -3104 bits)
-          type of 'int ()* const c' changed:
-            entity changed from 'int ()* const' to 'int'
+          type of 'int (* const c)(void)' changed:
+            entity changed from 'int (*)(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3584 to 448 (in bits) (by -3136 bits)
           type of 'volatile int d[7][7]' changed:
@@ -90,47 +90,47 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'volatile int* const[7]' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 5248 to 512 (in bits) (by -4736 bits)
-          type of 'int ()* const f[7]' changed:
-            entity changed from 'int ()* const[7]' to 'int'
+          type of 'void* const f[7]' changed:
+            entity changed from 'int (*)(void) const[7]' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 5696 to 544 (in bits) (by -5152 bits)
-          type of 'volatile int[7]* const g' changed:
-            entity changed from 'volatile int[7]* const' to 'int'
+          type of 'volatile int(* const g)[7]' changed:
+            entity changed from 'volatile int(*)[7] const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6144 to 576 (in bits) (by -5568 bits)
           type of 'volatile int* const* const h' changed:
             entity changed from 'volatile int* const* const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6208 to 608 (in bits) (by -5600 bits)
-          type of 'int ()* const i' changed:
-            entity changed from 'int ()* const' to 'int'
+          type of 'int (* const i)(void)' changed:
+            entity changed from 'int (*)(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6272 to 640 (in bits) (by -5632 bits)
-          type of 'volatile int[7]* ()* const j' changed:
-            entity changed from 'volatile int[7]* ()* const' to 'int'
+          type of 'volatile int(*(* const j)(void))[7]' changed:
+            entity changed from 'volatile int(*(*)(void))[7] const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6336 to 672 (in bits) (by -5664 bits)
-          type of 'volatile int* ()* const k' changed:
-            entity changed from 'volatile int* ()* const' to 'int'
+          type of 'volatile int* (* const k)(void)' changed:
+            entity changed from 'volatile int* (*)(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6400 to 704 (in bits) (by -5696 bits)
-          type of 'int ()* ()* const l' changed:
-            entity changed from 'int ()* ()* const' to 'int'
+          type of 'int (*(* const l)(void))(void)' changed:
+            entity changed from 'int (*(*)(void))(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6464 to 736 (in bits) (by -5728 bits)
 
-  [C] 'function volatile int[7]* n()' at PR30048-test-2-v0.cc:72:1 has some indirect sub-type changes:
+  [C] 'function volatile int(*n(void))[7]' at PR30048-test-2-v0.cc:72:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'volatile int[7]*' to 'int'
+      entity changed from 'volatile int(*)[7]' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function volatile int* o()' at PR30048-test-2-v0.cc:74:1 has some indirect sub-type changes:
+  [C] 'function volatile int* o(void)' at PR30048-test-2-v0.cc:74:1 has some indirect sub-type changes:
     return type changed:
       entity changed from 'volatile int*' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function int ()* p()' at PR30048-test-2-v0.cc:77:1 has some indirect sub-type changes:
+  [C] 'function int (*p(void))(void)' at PR30048-test-2-v0.cc:77:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'int ()*' to 'int'
+      entity changed from 'int (*)(void)' to 'int'
       type size changed from 64 to 32 (in bits)
 
diff --git a/tests/data/test-abidiff-exit/PR30048-test-report-0.txt b/tests/data/test-abidiff-exit/PR30048-test-report-0.txt
index 23a4c10b..26c04c6d 100644
--- a/tests/data/test-abidiff-exit/PR30048-test-report-0.txt
+++ b/tests/data/test-abidiff-exit/PR30048-test-report-0.txt
@@ -8,12 +8,12 @@  Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
     type of variable changed:
       type size changed from 448 to 128 (in bits)
       5 data member deletions:
-        'int (int)* f01', at offset 0 (in bits) at PR30048-test-v0.c:2:1
-        'int (const int*)* f02', at offset 64 (in bits) at PR30048-test-v0.c:3:1
-        'int (int* const)* f03', at offset 128 (in bits) at PR30048-test-v0.c:4:1
-        'int (int* restrict)* f04', at offset 192 (in bits) at PR30048-test-v0.c:5:1
-        'int (const int* restrict)* f05', at offset 256 (in bits) at PR30048-test-v0.c:6:1
+        'int (* f01)(int)', at offset 0 (in bits) at PR30048-test-v0.c:2:1
+        'int (* f02)(const int*)', at offset 64 (in bits) at PR30048-test-v0.c:3:1
+        'int (* f03)(int* const)', at offset 128 (in bits) at PR30048-test-v0.c:4:1
+        'int (* f04)(int* restrict)', at offset 192 (in bits) at PR30048-test-v0.c:5:1
+        'int (* f05)(const int* restrict)', at offset 256 (in bits) at PR30048-test-v0.c:6:1
       2 data member changes:
-        'int (int* restrict const)* f06' offset changed from 320 to 0 (in bits) (by -320 bits)
-        'int (int* restrict const)* f07' offset changed from 384 to 64 (in bits) (by -320 bits)
+        'int (* f06)(int* restrict const)' offset changed from 320 to 0 (in bits) (by -320 bits)
+        'int (* f07)(int* restrict const)' offset changed from 384 to 64 (in bits) (by -320 bits)
 
diff --git a/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt b/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt
index e5e40069..f83d9a11 100644
--- a/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt
+++ b/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt
@@ -142,7 +142,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                                   'void* pTrueEnd', at offset 704 (in bits) at sqlite3.c:16849:1
                             'sqlite3_xauth xAuth' offset changed from 3968 to 4032 (in bits) (by +64 bits)
                             'void* pAuthArg' offset changed from 4032 to 4096 (in bits) (by +64 bits)
-                            'int (void*)* xProgress' offset changed from 4096 to 4160 (in bits) (by +64 bits)
+                            'int (* xProgress)(void*)' offset changed from 4096 to 4160 (in bits) (by +64 bits)
                             'void* pProgressArg' offset changed from 4160 to 4224 (in bits) (by +64 bits)
                             'unsigned int nProgressOps' offset changed from 4224 to 4288 (in bits) (by +64 bits)
                             'int nVTrans' offset changed from 4256 to 4320 (in bits) (by +64 bits)
@@ -165,6 +165,6 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                             'sqlite3* pBlockingConnection' offset changed from 6144 to 6208 (in bits) (by +64 bits)
                             'sqlite3* pUnlockConnection' offset changed from 6208 to 6272 (in bits) (by +64 bits)
                             'void* pUnlockArg' offset changed from 6272 to 6336 (in bits) (by +64 bits)
-                            'void (void**, int)* xUnlockNotify' offset changed from 6336 to 6400 (in bits) (by +64 bits)
+                            'void (* xUnlockNotify)(void**, int)' offset changed from 6336 to 6400 (in bits) (by +64 bits)
                             'sqlite3* pNextBlocked' offset changed from 6400 to 6464 (in bits) (by +64 bits)
 
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 2b451fb7..73a38f9f 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
@@ -9,10 +9,10 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct SDL12_AudioCVT' at SDL12_compat.c:880:1 changed:
           type size hasn't changed
           1 data member change:
-            type of 'void (SDL_AudioCVT*, typedef Uint16)* filters[10]' changed:
-              array element type 'void (SDL_AudioCVT*, typedef Uint16)*' changed:
-                entity changed from 'void (SDL_AudioCVT*, typedef Uint16)*' to compatible type 'typedef SDL12_AudioCVTFilter' at SDL12_compat.c:903:1
-                  in pointed to type 'function type void (SDL_AudioCVT*, typedef SDL_AudioFormat)':
+            type of 'void (* filters[10])(SDL_AudioCVT*, Uint16)' changed:
+              array element type 'void (*)(SDL_AudioCVT*, Uint16)' changed:
+                entity changed from 'void (*)(SDL_AudioCVT*, Uint16)' to compatible type 'typedef SDL12_AudioCVTFilter' at SDL12_compat.c:903:1
+                  in pointed to type 'function type void (SDL_AudioCVT*, SDL_AudioFormat)':
                     parameter 1 of type 'SDL_AudioCVT*' changed:
                       in pointed to type 'struct SDL_AudioCVT' at SDL12_compat.c:907:1:
                         type name changed from 'SDL_AudioCVT' to 'SDL12_AudioCVT'
@@ -21,6 +21,6 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                           '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)
-              type name changed from 'void (SDL_AudioCVT*, typedef Uint16)*[10]' to 'SDL12_AudioCVTFilter[10]'
+              type name changed from 'void (*[10])(SDL_AudioCVT*, Uint16)' to 'SDL12_AudioCVTFilter[10]'
               type size hasn't changed
 
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
index 1233215e..69f3eb5f 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
@@ -3,13 +3,13 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function test1__my_int[6] test1__first_function()' at test1.adb:6:1 has some indirect sub-type changes:
+  [C] 'function test1__my_int[6] test1__first_function(void)' at test1.adb:6:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'test1__my_int[6]' to 'test1__my_int[7]'
       array type size changed from 6000 to 7000
       array type subrange 1 changed length from 6 to 7
 
-  [C] 'function test1__my_index test1__second_function()' at test1.adb:14:1 has some indirect sub-type changes:
+  [C] 'function test1__my_index test1__second_function(void)' at test1.adb:14:1 has some indirect sub-type changes:
     return type changed:
       upper bound of range 'test1__my_index' change from '5' to '6'
 
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
index 30d7488d..7c299ea9 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
@@ -5,13 +5,13 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some sub-type change:
 
-  [C] 'function test1__my_int[6] test1__first_function()' at test1.adb:6:1 has some sub-type changes:
+  [C] 'function test1__my_int[6] test1__first_function(void)' at test1.adb:6:1 has some sub-type changes:
     return type changed:
       type name changed from 'test1__my_int[6]' to 'test1__my_int[7]'
       array type size changed from 6000 to 7000
       array type subrange 1 changed length from 6 to 7
 
-  [C] 'function test1__my_index test1__second_function()' at test1.adb:14:1 has some sub-type changes:
+  [C] 'function test1__my_index test1__second_function(void)' at test1.adb:14:1 has some sub-type changes:
     return type changed:
       upper bound of range 'test1__my_index' change from '5' to '6'
 
diff --git a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
index 83b3e836..ac6ab3be 100644
--- a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
+++ b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
@@ -56,7 +56,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'typedef C' to compatible type 'void* restrict const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'void* restrict const'
-              type name changed from 'void* const[7]' to 'void* restrict const[7]'
+              type name changed from 'void* const[7]' to 'void* const restrict[7]'
               type size hasn't changed
           type of 'D v_d' changed:
             entity changed from 'typedef D' to compatible type 'void* const volatile[7]'
@@ -68,18 +68,18 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'typedef D' to compatible type 'void* restrict const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'void* restrict const'
-              type name changed from 'void* const[7]' to 'void* restrict const[7]'
+              type name changed from 'void* const[7]' to 'void* const restrict[7]'
               type size hasn't changed
           type of 'E r_e' changed:
             entity changed from 'typedef E' to compatible type 'void* restrict const volatile[7]'
               array element type 'void* const volatile' changed:
                 'void* const volatile' changed to 'void* restrict const volatile'
-              type name changed from 'void* const volatile[7]' to 'void* restrict const volatile[7]'
+              type name changed from 'void* const volatile[7]' to 'void* const volatile restrict const[7]'
               type size hasn't changed
           type of 'F r_f' changed:
             entity changed from 'typedef F' to compatible type 'void* restrict const volatile[7]'
               array element type 'void* const volatile' changed:
                 'void* const volatile' changed to 'void* restrict const volatile'
-              type name changed from 'void* const volatile[7]' to 'void* restrict const volatile[7]'
+              type name changed from 'void* const volatile[7]' to 'void* const volatile restrict const[7]'
               type size hasn't changed
 
diff --git a/tests/data/test-abidiff-exit/test-fun-param-report.txt b/tests/data/test-abidiff-exit/test-fun-param-report.txt
index 7e357483..e37bf0df 100644
--- a/tests/data/test-abidiff-exit/test-fun-param-report.txt
+++ b/tests/data/test-abidiff-exit/test-fun-param-report.txt
@@ -8,7 +8,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct ops' at test-fun-param-v1.c:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'void (void*, unsigned int, unsigned long int)* bind_class' changed:
+          type of 'void (* bind_class)(void*, unsigned int, unsigned long int)' changed:
             in pointed to type 'function type void (void*, unsigned int, unsigned long int)':
               parameter 4 of type 'void*' was added
               parameter 5 of type 'unsigned long int' was added
diff --git a/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt b/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt
index 16d4dc97..365a8f88 100644
--- a/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt
+++ b/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt
@@ -7,10 +7,10 @@  Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
     type of variable changed:
       type size hasn't changed
       6 data member changes:
-        'int (const char**, const char**, bool*, void (void*)*, void*)* _dl_catch_error' offset changed from 5120 to 5376 (in bits) (by +256 bits)
-        'void (void*)* _dl_error_free' offset changed from 5184 to 5440 (in bits) (by +256 bits)
-        'void* (link_map*)* _dl_tls_get_addr_soft' offset changed from 5248 to 5120 (in bits) (by -128 bits)
-        'int ()* _dl_discover_osversion' offset changed from 5312 to 5184 (in bits) (by -128 bits)
+        'int (* _dl_catch_error)(const char**, const char**, bool*, void*, void*)' offset changed from 5120 to 5376 (in bits) (by +256 bits)
+        'void (* _dl_error_free)(void*)' offset changed from 5184 to 5440 (in bits) (by +256 bits)
+        'void* (* _dl_tls_get_addr_soft)(link_map*)' offset changed from 5248 to 5120 (in bits) (by -128 bits)
+        'int (* _dl_discover_osversion)(void)' offset changed from 5312 to 5184 (in bits) (by -128 bits)
         'audit_ifaces* _dl_audit' offset changed from 5376 to 5248 (in bits) (by -128 bits)
         'unsigned int _dl_naudit' offset changed from 5440 to 5312 (in bits) (by -128 bits)
 
diff --git a/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt b/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt
index 1caf2cba..38be69a9 100644
--- a/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt
@@ -6,5 +6,5 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct ops' changed:
   type size hasn't changed
   there are data member changes:
-    type 'void (int)*' of 'ops::munge' changed:
-      pointer type changed from: 'void (int)*' to: 'char (long int, bool)*'
+    type 'void (*)(int)' of 'ops::munge' changed:
+      pointer type changed from: 'void (*)(int)' to: 'char (*)(long int, bool)'
diff --git a/tests/data/test-abidiff-exit/test-leaf-more-report.txt b/tests/data/test-abidiff-exit/test-leaf-more-report.txt
index aea08b81..c0a692c6 100644
--- a/tests/data/test-abidiff-exit/test-leaf-more-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-more-report.txt
@@ -5,15 +5,15 @@  Removed/Changed/Added variables summary: 1 Removed, 1 Changed, 1 Added variable
 
 1 Removed function:
 
-  [D] 'function int deleted_fun()'    {_Z11deleted_funv}
+  [D] 'function int deleted_fun(void)'    {_Z11deleted_funv}
 
 1 Added function:
 
-  [A] 'function long int added_fun()'    {_Z9added_funv}
+  [A] 'function long int added_fun(void)'    {_Z9added_funv}
 
 1 function with some sub-type change:
 
-  [C] 'function int directly_changed_fun()' has some sub-type changes:
+  [C] 'function int directly_changed_fun(void)' has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
index 7c51164b..a8eb1cd8 100644
--- a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
@@ -24,8 +24,8 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct ops3 at test-leaf-peeling-v0.cc:14:1' changed:
   type size hasn't changed
   there are data member changes:
-    type 'void (int&)*' of 'ops3::spong' changed:
-      pointer type changed from: 'void (int&)*' to: 'void (int&&)*'
+    type 'void (*)(int&)' of 'ops3::spong' changed:
+      pointer type changed from: 'void (*)(int&)' to: 'void (*)(int&&)'
 
 'struct ops4 at test-leaf-peeling-v0.cc:18:1' changed:
   type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test-leaf-stats-report.txt b/tests/data/test-abidiff-exit/test-leaf-stats-report.txt
index 25ee8dc5..e17b461b 100644
--- a/tests/data/test-abidiff-exit/test-leaf-stats-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-stats-report.txt
@@ -5,7 +5,7 @@  Removed/Changed/Added variables summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 function with some sub-type change:
 
-  [C] 'function int changed_fun()' has some sub-type changes:
+  [C] 'function int changed_fun(void)' has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-net-change-report0.txt b/tests/data/test-abidiff-exit/test-net-change-report0.txt
index 64ac3a83..e087c15f 100644
--- a/tests/data/test-abidiff-exit/test-net-change-report0.txt
+++ b/tests/data/test-abidiff-exit/test-net-change-report0.txt
@@ -3,15 +3,15 @@  Variables changes summary: 1 Removed, 1 Changed, 1 Added variables
 
 1 Removed function:
 
-  [D] 'function int fun_removed()'    {fun_removed}
+  [D] 'function int fun_removed(void)'    {fun_removed}
 
 1 Added function:
 
-  [A] 'function long int fun_added()'    {fun_added}
+  [A] 'function long int fun_added(void)'    {fun_added}
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function int fun_changed()' has some indirect sub-type changes:
+  [C] 'function int fun_changed(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-net-change-report2.txt b/tests/data/test-abidiff-exit/test-net-change-report2.txt
index ca3b3e05..c6fd8079 100644
--- a/tests/data/test-abidiff-exit/test-net-change-report2.txt
+++ b/tests/data/test-abidiff-exit/test-net-change-report2.txt
@@ -5,15 +5,15 @@  Removed/Changed/Added variables summary: 1 Removed, 1 Changed, 1 Added variable
 
 1 Removed function:
 
-  [D] 'function int fun_removed()'    {fun_removed}
+  [D] 'function int fun_removed(void)'    {fun_removed}
 
 1 Added function:
 
-  [A] 'function long int fun_added()'    {fun_added}
+  [A] 'function long int fun_added(void)'    {fun_added}
 
 1 function with some sub-type change:
 
-  [C] 'function int fun_changed()' has some sub-type changes:
+  [C] 'function int fun_changed(void)' has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
index 6640a6dd..ecfcc70d 100644
--- a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
+++ b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void to_erase()'    {to_erase}
+  [D] 'function void to_erase(void)'    {to_erase}
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index 49c96d53..18cb0cf9 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -16,11 +16,11 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct sigc::connection':
         type size hasn't changed
         1 data member change:
-          type of 'sigc::slot_base* slot_' changed:
+          type of 'slot_base* slot_' changed:
             in pointed to type 'class sigc::slot_base':
               type size hasn't changed
               1 data member change:
-                type of 'sigc::slot_base::rep_type* rep_' changed:
+                type of 'rep_type* rep_' changed:
                   in pointed to type 'typedef sigc::slot_base::rep_type':
                     underlying type 'struct sigc::internal::slot_rep' changed:
                       type size hasn't changed
@@ -28,7 +28,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                         'struct sigc::trackable' changed:
                           type size hasn't changed
                           1 data member change:
-                            type of 'sigc::internal::trackable_callback_list* callback_list_' changed:
+                            type of 'trackable_callback_list* callback_list_' changed:
                               in pointed to type 'struct sigc::internal::trackable_callback_list':
                                 type size changed from 192 to 256 (in bits)
                                 2 data member changes:
@@ -169,7 +169,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct sigc::trackable' changed:
             details were reported earlier
         1 data member change:
-          type of 'sigc::internal::signal_impl* impl_' changed:
+          type of 'signal_impl* impl_' changed:
             pointed to type 'struct sigc::internal::signal_impl' changed, as reported earlier
 
   [C] 'method bool sigc::signal_base::blocked()' has some indirect sub-type changes:
diff --git a/tests/data/test-abidiff/test-crc-report-0-1.txt b/tests/data/test-abidiff/test-crc-report-0-1.txt
index 0db42f68..0a6438f5 100644
--- a/tests/data/test-abidiff/test-crc-report-0-1.txt
+++ b/tests/data/test-abidiff/test-crc-report-0-1.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void exported_function()' has some indirect sub-type changes:
+  [C] 'function void exported_function(void)' has some indirect sub-type changes:
     CRC (modversions) changed from (none) to 0xe52d5bcf
 
 2 Changed variables:
diff --git a/tests/data/test-abidiff/test-crc-report-1-0.txt b/tests/data/test-abidiff/test-crc-report-1-0.txt
index e11f29c1..cb2fb86e 100644
--- a/tests/data/test-abidiff/test-crc-report-1-0.txt
+++ b/tests/data/test-abidiff/test-crc-report-1-0.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void exported_function()' has some indirect sub-type changes:
+  [C] 'function void exported_function(void)' has some indirect sub-type changes:
     CRC (modversions) changed from 0xe52d5bcf to (none)
 
 2 Changed variables:
diff --git a/tests/data/test-abidiff/test-crc-report-1-2.txt b/tests/data/test-abidiff/test-crc-report-1-2.txt
index 9bea309e..809e278f 100644
--- a/tests/data/test-abidiff/test-crc-report-1-2.txt
+++ b/tests/data/test-abidiff/test-crc-report-1-2.txt
@@ -3,6 +3,6 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void exported_function()' has some indirect sub-type changes:
+  [C] 'function void exported_function(void)' has some indirect sub-type changes:
     CRC (modversions) changed from 0xe52d5bcf to 0xe52d5bd0
 
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 9abd7adf..850b1255 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -1293,19 +1293,19 @@ 
         <var-decl name='message_function' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='387' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad1 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad1)(void*) -->
         <var-decl name='dbus_internal_pad1' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad2 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad2)(void*) -->
         <var-decl name='dbus_internal_pad2' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='390' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad3 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad3)(void*) -->
         <var-decl name='dbus_internal_pad3' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='391' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad4 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad4)(void*) -->
         <var-decl name='dbus_internal_pad4' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='392' column='1'/>
       </data-member>
     </class-decl>
@@ -1324,13 +1324,13 @@ 
         <var-decl name='counter_link' type-id='type-id-5' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='244' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef typedef dbus_bool_t (DBusTimeout*, void*)* DBusAddTimeoutFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusTimeout*, void*) DBusAddTimeoutFunction -->
     <typedef-decl name='DBusAddTimeoutFunction' type-id='type-id-70' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='110' column='1' id='type-id-71'/>
-    <!-- typedef typedef dbus_bool_t (DBusWatch*, void*)* DBusAddWatchFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusWatch*, void*) DBusAddWatchFunction -->
     <typedef-decl name='DBusAddWatchFunction' type-id='type-id-72' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='91' column='1' id='type-id-73'/>
-    <!-- typedef typedef dbus_bool_t (DBusConnection*, unsigned long int, void*)* DBusAllowUnixUserFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusConnection*, unsigned long int, void*) DBusAllowUnixUserFunction -->
     <typedef-decl name='DBusAllowUnixUserFunction' type-id='type-id-74' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='143' column='1' id='type-id-75'/>
-    <!-- typedef typedef dbus_bool_t (DBusConnection*, const char*, void*)* DBusAllowWindowsUserFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusConnection*, const char*, void*) DBusAllowWindowsUserFunction -->
     <typedef-decl name='DBusAllowWindowsUserFunction' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='153' column='1' id='type-id-77'/>
     <!-- typedef DBusAtomic DBusAtomic -->
     <typedef-decl name='DBusAtomic' type-id='type-id-56' filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-33'/>
@@ -1340,11 +1340,11 @@ 
     <typedef-decl name='DBusDataSlotList' type-id='type-id-59' filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-42'/>
     <!-- typedef DBusDispatchStatus DBusDispatchStatus -->
     <typedef-decl name='DBusDispatchStatus' type-id='type-id-52' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='84' column='1' id='type-id-47'/>
-    <!-- typedef void (DBusConnection*, typedef DBusDispatchStatus, void*)* DBusDispatchStatusFunction -->
+    <!-- typedef void (*)(DBusConnection*, DBusDispatchStatus, void*) DBusDispatchStatusFunction -->
     <typedef-decl name='DBusDispatchStatusFunction' type-id='type-id-79' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='128' column='1' id='type-id-46'/>
-    <!-- typedef void (void*)* DBusFreeFunction -->
+    <!-- typedef void (*)(void*) DBusFreeFunction -->
     <typedef-decl name='DBusFreeFunction' type-id='type-id-68' filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-45'/>
-    <!-- typedef typedef DBusHandlerResult (DBusConnection*, DBusMessage*, void*)* DBusHandleMessageFunction -->
+    <!-- typedef DBusHandlerResult (*)(DBusConnection*, DBusMessage*, void*) DBusHandleMessageFunction -->
     <typedef-decl name='DBusHandleMessageFunction' type-id='type-id-80' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='169' column='1' id='type-id-81'/>
     <!-- typedef DBusHandlerResult DBusHandlerResult -->
     <typedef-decl name='DBusHandlerResult' type-id='type-id-54' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-shared.h' line='71' column='1' id='type-id-53'/>
@@ -1354,9 +1354,9 @@ 
     <typedef-decl name='DBusHeaderField' type-id='type-id-62' filepath='../dbus/dbus-marshal-header.h' line='31' column='1' id='type-id-49'/>
     <!-- typedef DBusMessage DBusMessage -->
     <typedef-decl name='DBusMessage' type-id='type-id-63' filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-82'/>
-    <!-- typedef typedef DBusHandlerResult (DBusConnection*, DBusMessage*, void*)* DBusObjectPathMessageFunction -->
+    <!-- typedef DBusHandlerResult (*)(DBusConnection*, DBusMessage*, void*) DBusObjectPathMessageFunction -->
     <typedef-decl name='DBusObjectPathMessageFunction' type-id='type-id-80' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='374' column='1' id='type-id-67'/>
-    <!-- typedef void (DBusConnection*, void*)* DBusObjectPathUnregisterFunction -->
+    <!-- typedef void (*)(DBusConnection*, void*) DBusObjectPathUnregisterFunction -->
     <typedef-decl name='DBusObjectPathUnregisterFunction' type-id='type-id-83' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='367' column='1' id='type-id-66'/>
     <!-- typedef DBusObjectPathVTable DBusObjectPathVTable -->
     <typedef-decl name='DBusObjectPathVTable' type-id='type-id-65' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='53' column='1' id='type-id-84'/>
@@ -1364,67 +1364,67 @@ 
     <typedef-decl name='DBusPendingCall' type-id='type-id-85' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='49' column='1' id='type-id-86'/>
     <!-- typedef DBusPreallocatedSend DBusPreallocatedSend -->
     <typedef-decl name='DBusPreallocatedSend' type-id='type-id-69' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='47' column='1' id='type-id-87'/>
-    <!-- typedef void (DBusTimeout*, void*)* DBusRemoveTimeoutFunction -->
+    <!-- typedef void (*)(DBusTimeout*, void*) DBusRemoveTimeoutFunction -->
     <typedef-decl name='DBusRemoveTimeoutFunction' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='123' column='1' id='type-id-89'/>
-    <!-- typedef void (DBusWatch*, void*)* DBusRemoveWatchFunction -->
+    <!-- typedef void (*)(DBusWatch*, void*) DBusRemoveWatchFunction -->
     <typedef-decl name='DBusRemoveWatchFunction' type-id='type-id-90' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='103' column='1' id='type-id-91'/>
     <!-- typedef DBusTimeout DBusTimeout -->
     <typedef-decl name='DBusTimeout' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='45' column='1' id='type-id-93'/>
-    <!-- typedef void (DBusTimeout*, void*)* DBusTimeoutToggledFunction -->
+    <!-- typedef void (*)(DBusTimeout*, void*) DBusTimeoutToggledFunction -->
     <typedef-decl name='DBusTimeoutToggledFunction' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='117' column='1' id='type-id-94'/>
-    <!-- typedef void (void*)* DBusWakeupMainFunction -->
+    <!-- typedef void (*)(void*) DBusWakeupMainFunction -->
     <typedef-decl name='DBusWakeupMainFunction' type-id='type-id-68' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='135' column='1' id='type-id-44'/>
     <!-- typedef DBusWatch DBusWatch -->
     <typedef-decl name='DBusWatch' type-id='type-id-95' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='43' column='1' id='type-id-96'/>
-    <!-- typedef void (DBusWatch*, void*)* DBusWatchToggledFunction -->
+    <!-- typedef void (*)(DBusWatch*, void*) DBusWatchToggledFunction -->
     <typedef-decl name='DBusWatchToggledFunction' type-id='type-id-90' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='97' column='1' id='type-id-97'/>
     <!-- typedef int dbus_int32_t -->
     <typedef-decl name='dbus_int32_t' type-id='type-id-2' filepath='../dbus/dbus-arch-deps.h' line='42' column='1' id='type-id-98'/>
     <!-- DBusDataSlot* -->
     <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-60'/>
+    <!-- DBusHandlerResult (*)(DBusConnection*, DBusMessage*, void*) -->
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-80'/>
     <!-- DBusMessage* -->
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-37'/>
     <!-- DBusPendingCall* -->
-    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-99'/>
+    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-100'/>
     <!-- DBusPendingCall** -->
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-101'/>
     <!-- DBusPreallocatedSend* -->
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-102'/>
     <!-- DBusTimeout* -->
-    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-102'/>
+    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-103'/>
     <!-- DBusWatch* -->
-    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-104'/>
     <!-- char** -->
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-105'/>
     <!-- char*** -->
-    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
     <!-- const DBusObjectPathVTable -->
-    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-106'/>
+    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-107'/>
     <!-- const DBusObjectPathVTable* -->
-    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
+    <!-- dbus_bool_t (*)(DBusConnection*, const char*, void*) -->
+    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-76'/>
+    <!-- dbus_bool_t (*)(DBusConnection*, unsigned long int, void*) -->
+    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-74'/>
+    <!-- dbus_bool_t (*)(DBusTimeout*, void*) -->
+    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-70'/>
+    <!-- dbus_bool_t (*)(DBusWatch*, void*) -->
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-72'/>
     <!-- dbus_int32_t* -->
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-108'/>
-    <!-- typedef DBusHandlerResult (DBusConnection*, DBusMessage*, void*)* -->
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-80'/>
-    <!-- typedef dbus_bool_t (DBusConnection*, const char*, void*)* -->
-    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-76'/>
-    <!-- typedef dbus_bool_t (DBusConnection*, unsigned long int, void*)* -->
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-74'/>
-    <!-- typedef dbus_bool_t (DBusTimeout*, void*)* -->
-    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-70'/>
-    <!-- typedef dbus_bool_t (DBusWatch*, void*)* -->
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-72'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-113'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-114'/>
-    <!-- void (DBusConnection*, typedef DBusDispatchStatus, void*)* -->
+    <!-- void (*)(DBusConnection*, DBusDispatchStatus, void*) -->
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-79'/>
-    <!-- void (DBusConnection*, void*)* -->
+    <!-- void (*)(DBusConnection*, void*) -->
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-83'/>
-    <!-- void (DBusTimeout*, void*)* -->
+    <!-- void (*)(DBusTimeout*, void*) -->
     <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-88'/>
-    <!-- void (DBusWatch*, void*)* -->
+    <!-- void (*)(DBusWatch*, void*) -->
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-90'/>
-    <!-- void (void*)* -->
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-68'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-120'/>
@@ -1482,7 +1482,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- DBusTimeout* DBusPendingCall::timeout -->
-        <var-decl name='timeout' type-id='type-id-102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
+        <var-decl name='timeout' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- DBusList* DBusPendingCall::timeout_link -->
@@ -1692,14 +1692,14 @@ 
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3165' column='1'/>
       <!-- DBusPreallocatedSend* -->
-      <return type-id='type-id-101'/>
+      <return type-id='type-id-102'/>
     </function-decl>
     <!-- void dbus_connection_free_preallocated_send(DBusConnection*, DBusPreallocatedSend*) -->
     <function-decl name='dbus_connection_free_preallocated_send' mangled-name='dbus_connection_free_preallocated_send' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_free_preallocated_send'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3191' column='1'/>
       <!-- parameter of type 'DBusPreallocatedSend*' -->
-      <parameter type-id='type-id-101' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3192' column='1'/>
+      <parameter type-id='type-id-102' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3192' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -1708,7 +1708,7 @@ 
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3217' column='1'/>
       <!-- parameter of type 'DBusPreallocatedSend*' -->
-      <parameter type-id='type-id-101' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3218' column='1'/>
+      <parameter type-id='type-id-102' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3218' column='1'/>
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3219' column='1'/>
       <!-- parameter of type 'dbus_uint32_t*' -->
@@ -1734,7 +1734,7 @@ 
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3400' column='1'/>
       <!-- parameter of type 'DBusPendingCall**' -->
-      <parameter type-id='type-id-100' name='pending_return' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3401' column='1'/>
+      <parameter type-id='type-id-101' name='pending_return' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3401' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='timeout_milliseconds' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3402' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -1927,7 +1927,7 @@ 
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-120' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5260' column='1'/>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='data_size' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5261' column='1'/>
+      <parameter type-id='type-id-113' name='data_size' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5261' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -1949,7 +1949,7 @@ 
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5357' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='windows_sid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5358' column='1'/>
+      <parameter type-id='type-id-105' name='windows_sid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5358' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -2015,7 +2015,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5673' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5674' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5674' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5675' column='1'/>
       <!-- parameter of type 'DBusError*' -->
@@ -2030,7 +2030,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5703' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5704' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5704' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5705' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -2043,7 +2043,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5743' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5744' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5744' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5745' column='1'/>
       <!-- parameter of type 'DBusError*' -->
@@ -2058,7 +2058,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5775' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5776' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5776' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5777' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -2091,21 +2091,21 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='parent_path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5879' column='1'/>
       <!-- parameter of type 'char***' -->
-      <parameter type-id='type-id-105' name='child_entries' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5880' column='1'/>
+      <parameter type-id='type-id-106' name='child_entries' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5880' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- dbus_bool_t dbus_connection_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_connection_allocate_data_slot' mangled-name='dbus_connection_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5920' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5920' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_connection_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_connection_free_data_slot' mangled-name='dbus_connection_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5938' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5938' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -2227,7 +2227,7 @@ 
     <!-- typedef DBusWatchList DBusWatchList -->
     <typedef-decl name='DBusWatchList' type-id='type-id-141' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h' line='38' column='1' id='type-id-129'/>
     <!-- DBusHandlerResult (DBusConnection*, DBusMessage*, void*) -->
-    <function-type size-in-bits='64' id='type-id-109'>
+    <function-type size-in-bits='64' id='type-id-99'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'DBusMessage*' -->
@@ -2238,7 +2238,7 @@ 
       <return type-id='type-id-53'/>
     </function-type>
     <!-- dbus_bool_t (DBusConnection*, const char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-110'>
+    <function-type size-in-bits='64' id='type-id-109'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'const char*' -->
@@ -2249,7 +2249,7 @@ 
       <return type-id='type-id-16'/>
     </function-type>
     <!-- dbus_bool_t (DBusConnection*, unsigned long int, void*) -->
-    <function-type size-in-bits='64' id='type-id-111'>
+    <function-type size-in-bits='64' id='type-id-110'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'unsigned long int' -->
@@ -2260,18 +2260,18 @@ 
       <return type-id='type-id-16'/>
     </function-type>
     <!-- dbus_bool_t (DBusTimeout*, void*) -->
-    <function-type size-in-bits='64' id='type-id-112'>
+    <function-type size-in-bits='64' id='type-id-111'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-103'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-type>
     <!-- dbus_bool_t (DBusWatch*, void*) -->
-    <function-type size-in-bits='64' id='type-id-113'>
+    <function-type size-in-bits='64' id='type-id-112'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- typedef dbus_bool_t -->
@@ -2300,7 +2300,7 @@ 
     <!-- void (DBusTimeout*, void*) -->
     <function-type size-in-bits='64' id='type-id-117'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-103'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- void -->
@@ -2309,7 +2309,7 @@ 
     <!-- void (DBusWatch*, void*) -->
     <function-type size-in-bits='64' id='type-id-118'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- void -->
@@ -2429,7 +2429,7 @@ 
     <!-- void dbus_free_string_array(char**) -->
     <function-decl name='dbus_free_string_array' mangled-name='dbus_free_string_array' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_free_string_array'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='str_array' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='749' column='1'/>
+      <parameter type-id='type-id-105' name='str_array' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='749' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -2908,7 +2908,7 @@ 
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3164' column='1'/>
       <!-- parameter of type 'char***' -->
-      <parameter type-id='type-id-105' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3165' column='1'/>
+      <parameter type-id='type-id-106' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3165' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -3094,14 +3094,14 @@ 
     <!-- dbus_bool_t dbus_message_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_message_allocate_data_slot' mangled-name='dbus_message_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4560' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4560' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_message_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_message_free_data_slot' mangled-name='dbus_message_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4578' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4578' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -3146,7 +3146,7 @@ 
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='msg' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4721' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='marshalled_data_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4722' column='1'/>
+      <parameter type-id='type-id-105' name='marshalled_data_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4722' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-23' name='len_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4723' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -3216,7 +3216,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- DBusTimeout* DBusPendingCall::timeout -->
-        <var-decl name='timeout' type-id='type-id-102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
+        <var-decl name='timeout' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- DBusList* DBusPendingCall::timeout_link -->
@@ -3235,28 +3235,28 @@ 
         <var-decl name='timeout_added' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='79' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void (DBusPendingCall*, void*)* DBusPendingCallNotifyFunction -->
+    <!-- typedef void (*)(DBusPendingCall*, void*) DBusPendingCallNotifyFunction -->
     <typedef-decl name='DBusPendingCallNotifyFunction' type-id='type-id-153' filepath='../dbus/dbus-connection.h' line='162' column='1' id='type-id-135'/>
-    <!-- void (DBusPendingCall*, void*)* -->
+    <!-- void (*)(DBusPendingCall*, void*) -->
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-153'/>
     <!-- DBusPendingCall* dbus_pending_call_ref(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_ref' mangled-name='dbus_pending_call_ref' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_ref'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='577' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='577' column='1'/>
       <!-- DBusPendingCall* -->
-      <return type-id='type-id-99'/>
+      <return type-id='type-id-100'/>
     </function-decl>
     <!-- void dbus_pending_call_unref(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_unref' mangled-name='dbus_pending_call_unref' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_unref'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='597' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='597' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_set_notify(DBusPendingCall*, DBusPendingCallNotifyFunction, void*, DBusFreeFunction) -->
     <function-decl name='dbus_pending_call_set_notify' mangled-name='dbus_pending_call_set_notify' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_set_notify'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='622' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='622' column='1'/>
       <!-- parameter of type 'typedef DBusPendingCallNotifyFunction' -->
       <parameter type-id='type-id-135' name='function' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='623' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -3269,49 +3269,49 @@ 
     <!-- void dbus_pending_call_cancel(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_cancel' mangled-name='dbus_pending_call_cancel' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_cancel'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='663' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='663' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_get_completed(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_get_completed' mangled-name='dbus_pending_call_get_completed' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_get_completed'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='679' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='679' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- DBusMessage* dbus_pending_call_steal_reply(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_steal_reply' mangled-name='dbus_pending_call_steal_reply' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_steal_reply'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='702' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='702' column='1'/>
       <!-- DBusMessage* -->
       <return type-id='type-id-37'/>
     </function-decl>
     <!-- void dbus_pending_call_block(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_block' mangled-name='dbus_pending_call_block' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_block'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='737' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='737' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_pending_call_allocate_data_slot' mangled-name='dbus_pending_call_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='759' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='759' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_pending_call_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_pending_call_free_data_slot' mangled-name='dbus_pending_call_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='779' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='779' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_set_data(DBusPendingCall*, dbus_int32_t, void*, DBusFreeFunction) -->
     <function-decl name='dbus_pending_call_set_data' mangled-name='dbus_pending_call_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_set_data'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='801' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='801' column='1'/>
       <!-- parameter of type 'typedef dbus_int32_t' -->
       <parameter type-id='type-id-98' name='slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='802' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -3324,7 +3324,7 @@ 
     <!-- void* dbus_pending_call_get_data(DBusPendingCall*, dbus_int32_t) -->
     <function-decl name='dbus_pending_call_get_data' mangled-name='dbus_pending_call_get_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='827' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_get_data'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='827' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='827' column='1'/>
       <!-- parameter of type 'typedef dbus_int32_t' -->
       <parameter type-id='type-id-98' name='slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='828' column='1'/>
       <!-- void* -->
@@ -3333,7 +3333,7 @@ 
     <!-- void (DBusPendingCall*, void*) -->
     <function-type size-in-bits='64' id='type-id-154'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-100'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- void -->
@@ -3411,7 +3411,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- char** DBusServer::auth_mechanisms -->
-        <var-decl name='auth_mechanisms' type-id='type-id-104' visibility='default' filepath='../dbus/dbus-server-protected.h' line='85' column='1'/>
+        <var-decl name='auth_mechanisms' type-id='type-id-105' visibility='default' filepath='../dbus/dbus-server-protected.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- unsigned int DBusServer::disconnected -->
@@ -3425,17 +3425,17 @@ 
     <!-- struct DBusServerVTable -->
     <class-decl name='DBusServerVTable' size-in-bits='128' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='44' column='1' id='type-id-166'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void (DBusServer*)* DBusServerVTable::finalize -->
+        <!-- void (* DBusServerVTable::finalize)(DBusServer*) -->
         <var-decl name='finalize' type-id='type-id-167' visibility='default' filepath='../dbus/dbus-server-protected.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void (DBusServer*)* DBusServerVTable::disconnect -->
+        <!-- void (* DBusServerVTable::disconnect)(DBusServer*) -->
         <var-decl name='disconnect' type-id='type-id-167' visibility='default' filepath='../dbus/dbus-server-protected.h' line='48' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef DBusGUID DBusGUID -->
     <typedef-decl name='DBusGUID' type-id='type-id-168' filepath='../dbus/dbus-sysdeps.h' line='507' column='1' id='type-id-162'/>
-    <!-- typedef void (DBusServer*, DBusConnection*, void*)* DBusNewConnectionFunction -->
+    <!-- typedef void (*)(DBusServer*, DBusConnection*, void*) DBusNewConnectionFunction -->
     <typedef-decl name='DBusNewConnectionFunction' type-id='type-id-169' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h' line='47' column='1' id='type-id-165'/>
     <!-- typedef DBusServer DBusServer -->
     <typedef-decl name='DBusServer' type-id='type-id-159' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h' line='42' column='1' id='type-id-170'/>
@@ -3460,9 +3460,9 @@ 
     <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-160'/>
     <!-- const char** -->
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-174'/>
-    <!-- void (DBusServer*)* -->
+    <!-- void (*)(DBusServer*) -->
     <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-167'/>
-    <!-- void (DBusServer*, DBusConnection*, void*)* -->
+    <!-- void (*)(DBusServer*, DBusConnection*, void*) -->
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-169'/>
     <!-- DBusRMutex* -->
     <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-161'/>
@@ -3592,14 +3592,14 @@ 
     <!-- dbus_bool_t dbus_server_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_server_allocate_data_slot' mangled-name='dbus_server_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_server_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1077' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1077' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_server_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_server_free_data_slot' mangled-name='dbus_server_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_server_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1095' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1095' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -3900,72 +3900,72 @@ 
         <var-decl name='recursive_mutex_unlock' type-id='type-id-203' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='171' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <!-- void ()* DBusThreadFunctions::padding1 -->
+        <!-- void (* DBusThreadFunctions::padding1)(void) -->
         <var-decl name='padding1' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <!-- void ()* DBusThreadFunctions::padding2 -->
+        <!-- void (* DBusThreadFunctions::padding2)(void) -->
         <var-decl name='padding2' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <!-- void ()* DBusThreadFunctions::padding3 -->
+        <!-- void (* DBusThreadFunctions::padding3)(void) -->
         <var-decl name='padding3' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='175' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- void ()* DBusThreadFunctions::padding4 -->
+        <!-- void (* DBusThreadFunctions::padding4)(void) -->
         <var-decl name='padding4' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='176' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void (DBusCondVar*)* DBusCondVarFreeFunction -->
+    <!-- typedef void (*)(DBusCondVar*) DBusCondVarFreeFunction -->
     <typedef-decl name='DBusCondVarFreeFunction' type-id='type-id-205' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='80' column='1' id='type-id-195'/>
-    <!-- typedef DBusCondVar* ()* DBusCondVarNewFunction -->
+    <!-- typedef DBusCondVar* (*)(void) DBusCondVarNewFunction -->
     <typedef-decl name='DBusCondVarNewFunction' type-id='type-id-206' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='77' column='1' id='type-id-194'/>
-    <!-- typedef void (DBusCondVar*, DBusMutex*)* DBusCondVarWaitFunction -->
+    <!-- typedef void (*)(DBusCondVar*, DBusMutex*) DBusCondVarWaitFunction -->
     <typedef-decl name='DBusCondVarWaitFunction' type-id='type-id-207' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='92' column='1' id='type-id-196'/>
-    <!-- typedef typedef dbus_bool_t (DBusCondVar*, DBusMutex*, int)* DBusCondVarWaitTimeoutFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusCondVar*, DBusMutex*, int) DBusCondVarWaitTimeoutFunction -->
     <typedef-decl name='DBusCondVarWaitTimeoutFunction' type-id='type-id-208' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='101' column='1' id='type-id-197'/>
-    <!-- typedef void (DBusCondVar*)* DBusCondVarWakeAllFunction -->
+    <!-- typedef void (*)(DBusCondVar*) DBusCondVarWakeAllFunction -->
     <typedef-decl name='DBusCondVarWakeAllFunction' type-id='type-id-205' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='114' column='1' id='type-id-199'/>
-    <!-- typedef void (DBusCondVar*)* DBusCondVarWakeOneFunction -->
+    <!-- typedef void (*)(DBusCondVar*) DBusCondVarWakeOneFunction -->
     <typedef-decl name='DBusCondVarWakeOneFunction' type-id='type-id-205' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='108' column='1' id='type-id-198'/>
-    <!-- typedef void (DBusMutex*)* DBusMutexFreeFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusMutexFreeFunction -->
     <typedef-decl name='DBusMutexFreeFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='48' column='1' id='type-id-191'/>
-    <!-- typedef typedef dbus_bool_t (DBusMutex*)* DBusMutexLockFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusMutex*) DBusMutexLockFunction -->
     <typedef-decl name='DBusMutexLockFunction' type-id='type-id-210' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='50' column='1' id='type-id-192'/>
-    <!-- typedef DBusMutex* ()* DBusMutexNewFunction -->
+    <!-- typedef DBusMutex* (*)(void) DBusMutexNewFunction -->
     <typedef-decl name='DBusMutexNewFunction' type-id='type-id-211' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='46' column='1' id='type-id-190'/>
-    <!-- typedef typedef dbus_bool_t (DBusMutex*)* DBusMutexUnlockFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusMutex*) DBusMutexUnlockFunction -->
     <typedef-decl name='DBusMutexUnlockFunction' type-id='type-id-210' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='52' column='1' id='type-id-193'/>
-    <!-- typedef void (DBusMutex*)* DBusRecursiveMutexFreeFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusRecursiveMutexFreeFunction -->
     <typedef-decl name='DBusRecursiveMutexFreeFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='64' column='1' id='type-id-201'/>
-    <!-- typedef void (DBusMutex*)* DBusRecursiveMutexLockFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusRecursiveMutexLockFunction -->
     <typedef-decl name='DBusRecursiveMutexLockFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='68' column='1' id='type-id-202'/>
-    <!-- typedef DBusMutex* ()* DBusRecursiveMutexNewFunction -->
+    <!-- typedef DBusMutex* (*)(void) DBusRecursiveMutexNewFunction -->
     <typedef-decl name='DBusRecursiveMutexNewFunction' type-id='type-id-211' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='61' column='1' id='type-id-200'/>
-    <!-- typedef void (DBusMutex*)* DBusRecursiveMutexUnlockFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusRecursiveMutexUnlockFunction -->
     <typedef-decl name='DBusRecursiveMutexUnlockFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='72' column='1' id='type-id-203'/>
     <!-- typedef DBusThreadFunctions DBusThreadFunctions -->
     <typedef-decl name='DBusThreadFunctions' type-id='type-id-189' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='178' column='1' id='type-id-188'/>
-    <!-- DBusCondVar* ()* -->
+    <!-- DBusCondVar* (*)(void) -->
     <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-206'/>
-    <!-- DBusMutex* ()* -->
+    <!-- DBusMutex* (*)(void) -->
     <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-211'/>
     <!-- const DBusThreadFunctions -->
     <qualified-type-def type-id='type-id-188' const='yes' id='type-id-214'/>
     <!-- const DBusThreadFunctions* -->
     <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
-    <!-- typedef dbus_bool_t (DBusCondVar*, DBusMutex*, int)* -->
+    <!-- dbus_bool_t (*)(DBusCondVar*, DBusMutex*, int) -->
     <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-208'/>
-    <!-- typedef dbus_bool_t (DBusMutex*)* -->
+    <!-- dbus_bool_t (*)(DBusMutex*) -->
     <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-210'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-204'/>
-    <!-- void (DBusCondVar*)* -->
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-205'/>
-    <!-- void (DBusCondVar*, DBusMutex*)* -->
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-207'/>
-    <!-- void (DBusMutex*)* -->
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-209'/>
+    <!-- void (*)(DBusCondVar*) -->
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-205'/>
+    <!-- void (*)(DBusCondVar*, DBusMutex*) -->
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-207'/>
+    <!-- void (*)(DBusMutex*) -->
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-209'/>
+    <!-- void (*)(void) -->
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-204'/>
     <!-- DBusCondVar* -->
     <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
     <!-- DBusMutex* -->
@@ -4018,20 +4018,15 @@ 
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-type>
-    <!-- void () -->
-    <function-type size-in-bits='64' id='type-id-218'>
-      <!-- void -->
-      <return type-id='type-id-24'/>
-    </function-type>
     <!-- void (DBusCondVar*) -->
-    <function-type size-in-bits='64' id='type-id-219'>
+    <function-type size-in-bits='64' id='type-id-218'>
       <!-- parameter of type 'DBusCondVar*' -->
       <parameter type-id='type-id-223'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-type>
     <!-- void (DBusCondVar*, DBusMutex*) -->
-    <function-type size-in-bits='64' id='type-id-220'>
+    <function-type size-in-bits='64' id='type-id-219'>
       <!-- parameter of type 'DBusCondVar*' -->
       <parameter type-id='type-id-223'/>
       <!-- parameter of type 'DBusMutex*' -->
@@ -4040,12 +4035,17 @@ 
       <return type-id='type-id-24'/>
     </function-type>
     <!-- void (DBusMutex*) -->
-    <function-type size-in-bits='64' id='type-id-221'>
+    <function-type size-in-bits='64' id='type-id-220'>
       <!-- parameter of type 'DBusMutex*' -->
       <parameter type-id='type-id-225'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-type>
+    <!-- void () -->
+    <function-type size-in-bits='64' id='type-id-221'>
+      <!-- void -->
+      <return type-id='type-id-24'/>
+    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='dbus-timeout.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct DBusTimeout -->
@@ -4083,28 +4083,28 @@ 
         <var-decl name='enabled' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef typedef dbus_bool_t (void*)* DBusTimeoutHandler -->
+    <!-- typedef dbus_bool_t (*)(void*) DBusTimeoutHandler -->
     <typedef-decl name='DBusTimeoutHandler' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h' line='41' column='1' id='type-id-137'/>
-    <!-- typedef dbus_bool_t (void*)* -->
+    <!-- dbus_bool_t (*)(void*) -->
     <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-228'/>
     <!-- int dbus_timeout_get_interval(DBusTimeout*) -->
     <function-decl name='dbus_timeout_get_interval' mangled-name='dbus_timeout_get_interval' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_get_interval'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='416' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='416' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void* dbus_timeout_get_data(DBusTimeout*) -->
     <function-decl name='dbus_timeout_get_data' mangled-name='dbus_timeout_get_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_get_data'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='429' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='429' column='1'/>
       <!-- void* -->
       <return type-id='type-id-9'/>
     </function-decl>
     <!-- void dbus_timeout_set_data(DBusTimeout*, void*, DBusFreeFunction) -->
     <function-decl name='dbus_timeout_set_data' mangled-name='dbus_timeout_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_set_data'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='446' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='446' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='447' column='1'/>
       <!-- parameter of type 'typedef DBusFreeFunction' -->
@@ -4115,14 +4115,14 @@ 
     <!-- dbus_bool_t dbus_timeout_handle(DBusTimeout*) -->
     <function-decl name='dbus_timeout_handle' mangled-name='dbus_timeout_handle' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_handle'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='472' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='472' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- dbus_bool_t dbus_timeout_get_enabled(DBusTimeout*) -->
     <function-decl name='dbus_timeout_get_enabled' mangled-name='dbus_timeout_get_enabled' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_get_enabled'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='486' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='486' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -4140,7 +4140,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='filename' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='83' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='84' column='1'/>
+      <parameter type-id='type-id-105' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='84' column='1'/>
       <!-- parameter of type 'typedef dbus_bool_t' -->
       <parameter type-id='type-id-16' name='create_if_not_found' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='85' column='1'/>
       <!-- parameter of type 'DBusError*' -->
@@ -4151,7 +4151,7 @@ 
     <!-- dbus_bool_t dbus_internal_do_not_use_create_uuid(char**) -->
     <function-decl name='dbus_internal_do_not_use_create_uuid' mangled-name='dbus_internal_do_not_use_create_uuid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_internal_do_not_use_create_uuid'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1'/>
+      <parameter type-id='type-id-105' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -4200,49 +4200,49 @@ 
         <var-decl name='oom_last_time' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef typedef dbus_bool_t (DBusWatch*, unsigned int, void*)* DBusWatchHandler -->
+    <!-- typedef dbus_bool_t (*)(DBusWatch*, unsigned int, void*) DBusWatchHandler -->
     <typedef-decl name='DBusWatchHandler' type-id='type-id-230' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h' line='43' column='1' id='type-id-140'/>
-    <!-- typedef dbus_bool_t (DBusWatch*, unsigned int, void*)* -->
+    <!-- dbus_bool_t (*)(DBusWatch*, unsigned int, void*) -->
     <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-230'/>
     <!-- int dbus_watch_get_fd(DBusWatch*) -->
     <function-decl name='dbus_watch_get_fd' mangled-name='dbus_watch_get_fd' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='536' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_fd'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='536' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='536' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int dbus_watch_get_unix_fd(DBusWatch*) -->
     <function-decl name='dbus_watch_get_unix_fd' mangled-name='dbus_watch_get_unix_fd' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_unix_fd'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='557' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='557' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int dbus_watch_get_socket(DBusWatch*) -->
     <function-decl name='dbus_watch_get_socket' mangled-name='dbus_watch_get_socket' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_socket'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='586' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='586' column='1'/>
       <!-- int -->
       <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'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-8'/>
     </function-decl>
     <!-- void* dbus_watch_get_data(DBusWatch*) -->
     <function-decl name='dbus_watch_get_data' mangled-name='dbus_watch_get_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_data'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='623' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='623' column='1'/>
       <!-- void* -->
       <return type-id='type-id-9'/>
     </function-decl>
     <!-- void dbus_watch_set_data(DBusWatch*, void*, DBusFreeFunction) -->
     <function-decl name='dbus_watch_set_data' mangled-name='dbus_watch_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_set_data'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='642' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='642' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='643' column='1'/>
       <!-- parameter of type 'typedef DBusFreeFunction' -->
@@ -4253,14 +4253,14 @@ 
     <!-- dbus_bool_t dbus_watch_get_enabled(DBusWatch*) -->
     <function-decl name='dbus_watch_get_enabled' mangled-name='dbus_watch_get_enabled' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_enabled'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='667' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='667' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- dbus_bool_t dbus_watch_handle(DBusWatch*, unsigned int) -->
     <function-decl name='dbus_watch_handle' mangled-name='dbus_watch_handle' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_handle'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='698' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='698' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-8' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='699' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -4269,7 +4269,7 @@ 
     <!-- dbus_bool_t (DBusWatch*, unsigned int, void*) -->
     <function-type size-in-bits='64' id='type-id-231'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'void*' -->
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 07e81a50..e7f0e2c6 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -186,51 +186,51 @@ 
         <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
-        <!-- void (typedef GLenum)* OpenGLCurveEvaluator::beginCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
-        <!-- void ()* OpenGLCurveEvaluator::endCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::vertexCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::normalCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::colorCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::texcoordCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
-        <!-- void (typedef GLenum, void*)* OpenGLCurveEvaluator::beginCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
-        <!-- void (void*)* OpenGLCurveEvaluator::endCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::vertexCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::normalCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::colorCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::texcoordCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
@@ -578,9 +578,9 @@ 
     <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-23'/>
     <!-- curveEvalMachine* -->
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-33'/>
-    <!-- void (const GLfloat*)* -->
+    <!-- void(*)(const GLfloat*) -->
     <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-13'/>
-    <!-- void (const GLfloat*, void*)* -->
+    <!-- void(*)(const GLfloat*, void*) -->
     <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-16'/>
     <!-- CurveMap* -->
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-20'/>
@@ -942,48 +942,48 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat(*)[4]) -->
         <function-decl name='transform4d' mangled-name='_ZN8GLUnurbs11transform4dEPfS0_PA4_f' filepath='libnurbs/interface/glrenderer.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::multmatrix4d(GLfloat[4]*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::multmatrix4d(GLfloat(*)[4], GLfloat(*)[4]) -->
         <function-decl name='multmatrix4d' mangled-name='_ZN8GLUnurbs12multmatrix4dEPA4_fPA4_KfS4_' filepath='libnurbs/interface/glrenderer.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadCullingMatrix(GLfloat[4]*) -->
+        <!-- void GLUnurbs::loadCullingMatrix(GLfloat(*)[4]) -->
         <function-decl name='loadCullingMatrix' mangled-name='_ZN8GLUnurbs17loadCullingMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat[4]*, const GLint*) -->
+        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat(*)[4], const GLint*) -->
         <function-decl name='loadSamplingMatrix' mangled-name='_ZN8GLUnurbs18loadSamplingMatrixEPA4_KfPKi' filepath='libnurbs/interface/glrenderer.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-52'/>
@@ -1018,7 +1018,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void GLUnurbs::grabGLMatrix() -->
         <function-decl name='grabGLMatrix' mangled-name='_ZN8GLUnurbs12grabGLMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -1096,51 +1096,51 @@ 
         <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <!-- void (typedef GLenum)* OpenGLSurfaceEvaluator::beginCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <!-- void ()* OpenGLSurfaceEvaluator::endCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::vertexCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::normalCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::colorCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::texcoordCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <!-- void (typedef GLenum, void*)* OpenGLSurfaceEvaluator::beginCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <!-- void (void*)* OpenGLSurfaceEvaluator::endCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::vertexCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::normalCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::colorCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::texcoordCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
@@ -2131,48 +2131,48 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat(*)[4]) -->
         <function-decl name='transform4d' mangled-name='_ZN8GLUnurbs11transform4dEPfS0_PA4_f' filepath='libnurbs/interface/glrenderer.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::multmatrix4d(GLfloat[4]*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::multmatrix4d(GLfloat(*)[4], GLfloat(*)[4]) -->
         <function-decl name='multmatrix4d' mangled-name='_ZN8GLUnurbs12multmatrix4dEPA4_fPA4_KfS4_' filepath='libnurbs/interface/glrenderer.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadCullingMatrix(GLfloat[4]*) -->
+        <!-- void GLUnurbs::loadCullingMatrix(GLfloat(*)[4]) -->
         <function-decl name='loadCullingMatrix' mangled-name='_ZN8GLUnurbs17loadCullingMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat[4]*, const GLint*) -->
+        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat(*)[4], const GLint*) -->
         <function-decl name='loadSamplingMatrix' mangled-name='_ZN8GLUnurbs18loadSamplingMatrixEPA4_KfPKi' filepath='libnurbs/interface/glrenderer.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-52'/>
@@ -2207,7 +2207,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void GLUnurbs::grabGLMatrix() -->
         <function-decl name='grabGLMatrix' mangled-name='_ZN8GLUnurbs12grabGLMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -2252,9 +2252,9 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (typedef GLenum)* errorCallbackType -->
+    <!-- typedef void(*)(GLenum) errorCallbackType -->
     <typedef-decl name='errorCallbackType' type-id='type-id-11' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-48'/>
-    <!-- GLfloat[4]* -->
+    <!-- GLfloat(*)[4] -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-51'/>
     <!-- class NurbsTessellator -->
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-47'>
@@ -2883,51 +2883,51 @@ 
         <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <!-- void (typedef GLenum)* OpenGLSurfaceEvaluator::beginCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <!-- void ()* OpenGLSurfaceEvaluator::endCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::vertexCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::normalCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::colorCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::texcoordCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <!-- void (typedef GLenum, void*)* OpenGLSurfaceEvaluator::beginCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <!-- void (void*)* OpenGLSurfaceEvaluator::endCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::vertexCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::normalCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::colorCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::texcoordCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
@@ -3878,7 +3878,7 @@ 
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-100'/>
     <!-- GLenum* -->
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-95'/>
-    <!-- REAL[3]* -->
+    <!-- REAL(*)[3] -->
     <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-101'/>
     <!-- StoredVertex* -->
     <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-87'/>
@@ -13565,9 +13565,9 @@ 
     <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-165'/>
     <!-- Quiltspec* -->
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-239'/>
-    <!-- REAL[5]* -->
+    <!-- REAL(*)[5] -->
     <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-242'/>
-    <!-- float[4]* -->
+    <!-- float(*)[4] -->
     <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-243'/>
     <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
     <!-- struct Flist -->
@@ -14368,7 +14368,7 @@ 
     <!-- struct PFVS -->
     <class-decl name='PFVS' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-261' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-263'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void (NurbsTessellator*, void*)* PFVS::__pfn -->
+        <!-- void(*PFVS::__pfn)(NurbsTessellator*, void*) -->
         <var-decl name='__pfn' type-id='type-id-264' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -14386,7 +14386,7 @@ 
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
     <!-- NurbsTessellator* -->
     <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-79'/>
-    <!-- void (NurbsTessellator*, void*)* -->
+    <!-- void(*)(NurbsTessellator*, void*) -->
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-264'/>
     <!-- void (NurbsTessellator*, void*) -->
     <function-type size-in-bits='64' id='type-id-265'>
@@ -14885,7 +14885,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void Mapdesc::copy(long int, float*, long int, long int) -->
         <function-decl name='copy' mangled-name='_ZN7Mapdesc4copyEPA5_flPfll' filepath='libnurbs/internals/mapdesc.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-24'/>
@@ -14919,11 +14919,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformRational(REAL[5]*, REAL*, REAL*) -->
+        <!-- void Mapdesc::xformRational(REAL(*)[5], REAL*, REAL*) -->
         <function-decl name='xformRational' mangled-name='_ZN7Mapdesc13xformRationalEPA5_fPfS2_' filepath='libnurbs/internals/mapdesc.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -14934,11 +14934,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformNonrational(REAL[5]*, REAL*, REAL*) -->
+        <!-- void Mapdesc::xformNonrational(REAL(*)[5], REAL*, REAL*) -->
         <function-decl name='xformNonrational' mangled-name='_ZN7Mapdesc16xformNonrationalEPA5_fPfS2_' filepath='libnurbs/internals/mapdesc.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -14949,11 +14949,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformMat(REAL[5]*, REAL*, int, int, REAL*, int) -->
+        <!-- void Mapdesc::xformMat(REAL(*)[5], REAL*, int, int, REAL*, int) -->
         <function-decl name='xformMat' mangled-name='_ZN7Mapdesc8xformMatEPA5_fPfiiS2_i' filepath='libnurbs/internals/mapdesc.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -15027,11 +15027,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformMat(REAL[5]*, REAL*, int, int, int, int, REAL*, int, int) -->
+        <!-- void Mapdesc::xformMat(REAL(*)[5], REAL*, int, int, int, int, REAL*, int, int) -->
         <function-decl name='xformMat' mangled-name='_ZN7Mapdesc8xformMatEPA5_fPfiiiiS2_ii' filepath='libnurbs/internals/mapdesc.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -15173,11 +15173,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::bbox(REAL[5]*, REAL*, int, int, int, int) -->
+        <!-- void Mapdesc::bbox(REAL(*)[5], REAL*, int, int, int, int) -->
         <function-decl name='bbox' mangled-name='_ZN7Mapdesc4bboxEPA5_fPfiiii' filepath='libnurbs/internals/mapdesc.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -15323,7 +15323,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- int Mapdesc::bboxTooBig(REAL*, int, int, int, int, REAL[5]*) -->
+        <!-- int Mapdesc::bboxTooBig(REAL*, int, int, int, int, REAL(*)[5]) -->
         <function-decl name='bboxTooBig' mangled-name='_ZN7Mapdesc10bboxTooBigEPfiiiiPA5_f' filepath='libnurbs/internals/mapdesc.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
@@ -15337,7 +15337,7 @@ 
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-10'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- int -->
           <return type-id='type-id-10'/>
@@ -15399,22 +15399,22 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::surfbbox(REAL[5]*) -->
+        <!-- void Mapdesc::surfbbox(REAL(*)[5]) -->
         <function-decl name='surfbbox' mangled-name='_ZN7Mapdesc8surfbboxEPA5_f' filepath='libnurbs/internals/mapdesc.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::identify(REAL[5]*) -->
+        <!-- void Mapdesc::identify(REAL(*)[5]) -->
         <function-decl name='identify' mangled-name='_ZN7Mapdesc8identifyEPA5_f' filepath='libnurbs/internals/mapdesc.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -16402,11 +16402,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16455,11 +16455,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16620,11 +16620,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16655,11 +16655,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16690,11 +16690,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16725,11 +16725,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16760,11 +16760,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16795,11 +16795,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16827,14 +16827,14 @@ 
     <typedef-decl name='Real2' type-id='type-id-283' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-295'/>
     <!-- Int* -->
     <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-285'/>
+    <!-- Real(*)[2] -->
+    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-294'/>
     <!-- Real* -->
     <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-286'/>
     <!-- Real** -->
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-292'/>
     <!-- Real2* -->
     <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-289'/>
-    <!-- Real[2]* -->
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-294'/>
     <!-- primStream* -->
     <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-187'/>
     <!-- reflexChain* -->
@@ -21338,13 +21338,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21413,13 +21413,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21470,13 +21470,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21527,13 +21527,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21584,13 +21584,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21641,13 +21641,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21698,13 +21698,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21755,13 +21755,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21812,13 +21812,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -22310,7 +22310,7 @@ 
         <var-decl name='frame' type-id='type-id-17' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- int (void*, typedef DictListKey, typedef DictListKey)* DictList::leq -->
+        <!-- int(*DictList::leq)(void*, DictListKey, DictListKey) -->
         <var-decl name='leq' type-id='type-id-383' visibility='default' filepath='libtess/dict.h' line='97' column='1'/>
       </data-member>
     </class-decl>
@@ -22429,7 +22429,7 @@ 
         <var-decl name='mesh' type-id='type-id-396' visibility='default' filepath='libtess/tess.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void (typedef GLenum)* GLUtesselator::callError -->
+        <!-- void(*GLUtesselator::callError)(GLenum) -->
         <var-decl name='callError' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
@@ -22469,7 +22469,7 @@ 
         <var-decl name='event' type-id='type-id-389' visibility='default' filepath='libtess/tess.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- void (GLdouble*, void**, GLfloat*, void**)* GLUtesselator::callCombine -->
+        <!-- void(*GLUtesselator::callCombine)(GLdouble*, void**, GLfloat*, void**) -->
         <var-decl name='callCombine' type-id='type-id-399' visibility='default' filepath='libtess/tess.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -22485,23 +22485,23 @@ 
         <var-decl name='lonelyTriList' type-id='type-id-387' visibility='default' filepath='libtess/tess.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <!-- void (typedef GLenum)* GLUtesselator::callBegin -->
+        <!-- void(*GLUtesselator::callBegin)(GLenum) -->
         <var-decl name='callBegin' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <!-- void (typedef GLboolean)* GLUtesselator::callEdgeFlag -->
+        <!-- void(*GLUtesselator::callEdgeFlag)(GLboolean) -->
         <var-decl name='callEdgeFlag' type-id='type-id-400' visibility='default' filepath='libtess/tess.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <!-- void (void*)* GLUtesselator::callVertex -->
+        <!-- void(*GLUtesselator::callVertex)(void*) -->
         <var-decl name='callVertex' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <!-- void ()* GLUtesselator::callEnd -->
+        <!-- void(*GLUtesselator::callEnd)(void) -->
         <var-decl name='callEnd' type-id='type-id-12' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <!-- void (GLUmesh*)* GLUtesselator::callMesh -->
+        <!-- void(*GLUtesselator::callMesh)(GLUmesh*) -->
         <var-decl name='callMesh' type-id='type-id-401' visibility='default' filepath='libtess/tess.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
@@ -22517,27 +22517,27 @@ 
         <var-decl name='cache' type-id='type-id-368' visibility='default' filepath='libtess/tess.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27328'>
-        <!-- void (typedef GLenum, void*)* GLUtesselator::callBeginData -->
+        <!-- void(*GLUtesselator::callBeginData)(GLenum, void*) -->
         <var-decl name='callBeginData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27392'>
-        <!-- void (typedef GLboolean, void*)* GLUtesselator::callEdgeFlagData -->
+        <!-- void(*GLUtesselator::callEdgeFlagData)(GLboolean, void*) -->
         <var-decl name='callEdgeFlagData' type-id='type-id-402' visibility='default' filepath='libtess/tess.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27456'>
-        <!-- void (void*, void*)* GLUtesselator::callVertexData -->
+        <!-- void(*GLUtesselator::callVertexData)(void*, void*) -->
         <var-decl name='callVertexData' type-id='type-id-403' visibility='default' filepath='libtess/tess.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27520'>
-        <!-- void (void*)* GLUtesselator::callEndData -->
+        <!-- void(*GLUtesselator::callEndData)(void*) -->
         <var-decl name='callEndData' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27584'>
-        <!-- void (typedef GLenum, void*)* GLUtesselator::callErrorData -->
+        <!-- void(*GLUtesselator::callErrorData)(GLenum, void*) -->
         <var-decl name='callErrorData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <!-- void (GLdouble*, void**, GLfloat*, void**, void*)* GLUtesselator::callCombineData -->
+        <!-- void(*GLUtesselator::callCombineData)(GLdouble*, void**, GLfloat*, void**, void*) -->
         <var-decl name='callCombineData' type-id='type-id-404' visibility='default' filepath='libtess/tess.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
@@ -22629,7 +22629,7 @@ 
         <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- int (typedef PQHeapKey, typedef PQHeapKey)* PriorityQHeap::leq -->
+        <!-- int(*PriorityQHeap::leq)(PQHeapKey, PQHeapKey) -->
         <var-decl name='leq' type-id='type-id-416' visibility='default' filepath='libtess/priorityq-heap.h' line='92' column='1'/>
       </data-member>
     </class-decl>
@@ -22660,7 +22660,7 @@ 
         <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- int (typedef PQSortKey, typedef PQSortKey)* PriorityQSort::leq -->
+        <!-- int(*PriorityQSort::leq)(PQSortKey, PQSortKey) -->
         <var-decl name='leq' type-id='type-id-416' visibility='default' filepath='libtess/priorityq.h' line='103' column='1'/>
       </data-member>
     </class-decl>
@@ -22763,27 +22763,27 @@ 
     <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-418'/>
     <!-- PriorityQSort* -->
     <pointer-type-def type-id='type-id-429' size-in-bits='64' id='type-id-398'/>
-    <!-- int (typedef PQHeapKey, typedef PQHeapKey)* -->
+    <!-- int(*)(PQHeapKey, PQHeapKey) -->
     <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-416'/>
-    <!-- int (void*, typedef DictListKey, typedef DictListKey)* -->
+    <!-- int(*)(void*, DictListKey, DictListKey) -->
     <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-383'/>
-    <!-- void (GLUmesh*)* -->
+    <!-- void(*)(GLUmesh*) -->
     <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-401'/>
-    <!-- void (GLdouble*, void**, GLfloat*, void**)* -->
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-399'/>
-    <!-- void (GLdouble*, void**, GLfloat*, void**, void*)* -->
-    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-404'/>
-    <!-- void (typedef GLboolean)* -->
-    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-400'/>
-    <!-- void (typedef GLboolean, void*)* -->
-    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-402'/>
-    <!-- void (typedef GLenum)* -->
+    <!-- void(*)(GLboolean) -->
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-400'/>
+    <!-- void(*)(GLboolean, void*) -->
+    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-402'/>
+    <!-- void(*)(GLdouble*, void**, GLfloat*, void**) -->
+    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-399'/>
+    <!-- void(*)(GLdouble*, void**, GLfloat*, void**, void*) -->
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-404'/>
+    <!-- void(*)(GLenum) -->
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-11'/>
-    <!-- void (typedef GLenum, void*)* -->
+    <!-- void(*)(GLenum, void*) -->
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-14'/>
-    <!-- void (void*)* -->
+    <!-- void(*)(void*) -->
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-15'/>
-    <!-- void (void*, void*)* -->
+    <!-- void(*)(void*, void*) -->
     <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-403'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-184'/>
@@ -22943,7 +22943,7 @@ 
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**) -->
-    <function-type size-in-bits='64' id='type-id-436'>
+    <function-type size-in-bits='64' id='type-id-438'>
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-441'/>
       <!-- parameter of type 'void**' -->
@@ -22956,7 +22956,7 @@ 
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**, void*) -->
-    <function-type size-in-bits='64' id='type-id-437'>
+    <function-type size-in-bits='64' id='type-id-439'>
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-441'/>
       <!-- parameter of type 'void**' -->
@@ -22971,14 +22971,14 @@ 
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLboolean) -->
-    <function-type size-in-bits='64' id='type-id-438'>
+    <function-type size-in-bits='64' id='type-id-436'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-49'/>
       <!-- void -->
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLboolean, void*) -->
-    <function-type size-in-bits='64' id='type-id-439'>
+    <function-type size-in-bits='64' id='type-id-437'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-49'/>
       <!-- parameter of type 'void*' -->
@@ -23370,7 +23370,7 @@ 
         <var-decl name='drawStyle' type-id='type-id-60' visibility='default' filepath='libutil/quad.c' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (typedef GLint)* GLUquadric::errorCallback -->
+        <!-- void(*GLUquadric::errorCallback)(GLint) -->
         <var-decl name='errorCallback' type-id='type-id-455' visibility='default' filepath='libutil/quad.c' line='50' column='1'/>
       </data-member>
     </class-decl>
@@ -23378,14 +23378,14 @@ 
     <typedef-decl name='GLUquadric' type-id='type-id-454' filepath='../../../include/GL/glu.h' line='275' column='1' id='type-id-456'/>
     <!-- typedef unsigned char GLboolean -->
     <typedef-decl name='GLboolean' type-id='type-id-443' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-49'/>
-    <!-- typedef void ()* _GLUfuncptr -->
+    <!-- typedef void(*)(void) _GLUfuncptr -->
     <typedef-decl name='_GLUfuncptr' type-id='type-id-12' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-22'/>
     <!-- GLUquadric* -->
     <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-12'/>
-    <!-- void (typedef GLint)* -->
+    <!-- void(*)(GLint) -->
     <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-455'/>
+    <!-- void(*)(void) -->
+    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-12'/>
     <!-- GLUquadric* gluNewQuadric() -->
     <function-decl name='gluNewQuadric' mangled-name='gluNewQuadric' filepath='libutil/quad.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewQuadric'>
       <!-- GLUquadric* -->
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index b749a0a6..65e69956 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3123,11 +3123,11 @@ 
         <var-decl name='alc' type-id='type-id-11' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='228' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-12' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-13'/>
-    <!-- typedef int (backtrace_state*, typedef uintptr_t, typedef backtrace_full_callback, typedef backtrace_error_callback, void*)* fileline -->
+    <!-- typedef int (*)(backtrace_state*, uintptr_t, backtrace_full_callback, backtrace_error_callback, void*) fileline -->
     <typedef-decl name='fileline' type-id='type-id-14' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='114' column='1' id='type-id-7'/>
-    <!-- typedef void (backtrace_state*, typedef uintptr_t, typedef backtrace_syminfo_callback, typedef backtrace_error_callback, void*)* syminfo -->
+    <!-- typedef void (*)(backtrace_state*, uintptr_t, backtrace_syminfo_callback, backtrace_error_callback, void*) syminfo -->
     <typedef-decl name='syminfo' type-id='type-id-15' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='121' column='1' id='type-id-8'/>
     <!-- backtrace_freelist_struct* -->
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-9'/>
@@ -3139,9 +3139,9 @@ 
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-20'/>
     <!-- fileline* -->
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-21'/>
-    <!-- int (backtrace_state*, typedef uintptr_t, typedef backtrace_full_callback, typedef backtrace_error_callback, void*)* -->
+    <!-- int (*)(backtrace_state*, uintptr_t, backtrace_full_callback, backtrace_error_callback, void*) -->
     <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-14'/>
-    <!-- void (backtrace_state*, typedef uintptr_t, typedef backtrace_syminfo_callback, typedef backtrace_error_callback, void*)* -->
+    <!-- void (*)(backtrace_state*, uintptr_t, backtrace_syminfo_callback, backtrace_error_callback, void*) -->
     <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-15'/>
     <!-- struct backtrace_freelist_struct -->
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' line='55' column='1' id='type-id-16'>
@@ -3191,7 +3191,7 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- void __asan_backtrace_qsort(void*, size_t, size_t, int (void*, void*)*) -->
+    <!-- void __asan_backtrace_qsort(void*, size_t, size_t, int (*)(void*, void*)) -->
     <function-decl name='__asan_backtrace_qsort' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
@@ -3199,7 +3199,7 @@ 
       <parameter type-id='type-id-11'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-11'/>
-      <!-- parameter of type 'int (void*, void*)*' -->
+      <!-- parameter of type 'int (*)(void*, void*)' -->
       <parameter type-id='type-id-12'/>
       <!-- void -->
       <return type-id='type-id-27'/>
@@ -3437,9 +3437,9 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int dl_iterate_phdr(int (dl_phdr_info*, typedef size_t, void*)*, void*) -->
+    <!-- int dl_iterate_phdr(int (*)(dl_phdr_info*, size_t, void*), void*) -->
     <function-decl name='dl_iterate_phdr' filepath='/usr/include/link.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'int (dl_phdr_info*, typedef size_t, void*)*' -->
+      <!-- parameter of type 'int (*)(dl_phdr_info*, size_t, void*)' -->
       <parameter type-id='type-id-36'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
@@ -4338,7 +4338,7 @@ 
     <qualified-type-def type-id='type-id-88' const='yes' id='type-id-89'/>
     <!-- const __sanitizer::CrashOnMapUnmap* -->
     <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-90'/>
-    <!-- void (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* -->
+    <!-- void (*)(__sanitizer::uptr, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-92'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -4393,7 +4393,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- typedef void (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* __sanitizer::LowLevelAllocateCallback -->
+      <!-- typedef void (*)(__sanitizer::uptr, __sanitizer::uptr) __sanitizer::LowLevelAllocateCallback -->
       <typedef-decl name='LowLevelAllocateCallback' type-id='type-id-92' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='116' column='1' id='type-id-93'/>
       <!-- __sanitizer::InternalAllocator* __sanitizer::internal_allocator() -->
       <function-decl name='internal_allocator' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4414,7 +4414,7 @@ 
         <enumerator name='AllocatorStatUnmapped' value='3'/>
         <enumerator name='AllocatorStatCount' value='4'/>
       </enum-decl>
-      <!-- typedef void (typedef __sanitizer::uptr, void*)* __sanitizer::ForEachChunkCallback -->
+      <!-- typedef void (*)(__sanitizer::uptr, void*) __sanitizer::ForEachChunkCallback -->
       <typedef-decl name='ForEachChunkCallback' type-id='type-id-96' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='284' column='1' id='type-id-97'/>
       <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > __sanitizer::InternalAllocatorCache -->
       <typedef-decl name='InternalAllocatorCache' type-id='type-id-98' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator_internal.h' line='43' column='1' id='type-id-99'/>
@@ -4609,9 +4609,9 @@ 
     <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-126'/>
     <!-- __sanitizer::StackTrace* -->
     <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-128'/>
-    <!-- bool (const unsigned long int&, const unsigned long int&)* -->
+    <!-- bool (*)(const unsigned long int&, const unsigned long int&) -->
     <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
-    <!-- bool (void*, char*, int)* -->
+    <!-- bool (*)(void*, char*, int) -->
     <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-132'/>
     <!-- const __sanitizer::LoadedModule -->
     <qualified-type-def type-id='type-id-125' const='yes' id='type-id-133'/>
@@ -4853,7 +4853,7 @@ 
       <!-- struct __sanitizer::StackTrace -->
       <class-decl name='StackTrace' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='31' column='1' id='type-id-127'>
         <member-type access='public'>
-          <!-- typedef bool (void*, char*, int)* __sanitizer::StackTrace::SymbolizeCallback -->
+          <!-- typedef bool (*)(void*, char*, int) __sanitizer::StackTrace::SymbolizeCallback -->
           <typedef-decl name='SymbolizeCallback' type-id='type-id-132' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='33' column='1' id='type-id-141'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -4982,7 +4982,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- typedef void ()* __sanitizer::DieCallbackType -->
+      <!-- typedef void (*)(void) __sanitizer::DieCallbackType -->
       <typedef-decl name='DieCallbackType' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='202' column='1' id='type-id-145'/>
       <!-- class __sanitizer::Symbolizer -->
       <class-decl name='Symbolizer' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='64' column='1' id='type-id-146'>
@@ -5062,11 +5062,11 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::EndSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::EndSymbolizationHook -->
           <typedef-decl name='EndSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='111' column='1' id='type-id-150'/>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::StartSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::StartSymbolizationHook -->
           <typedef-decl name='StartSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='110' column='1' id='type-id-151'/>
         </member-type>
         <data-member access='private' static='yes'>
@@ -5289,7 +5289,7 @@ 
         <!-- void -->
         <return type-id='type-id-27'/>
       </function-decl>
-      <!-- typedef void (const char*, int, const char*, typedef __sanitizer::u64, typedef __sanitizer::u64)* __sanitizer::CheckFailedCallbackType -->
+      <!-- typedef void (*)(const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) __sanitizer::CheckFailedCallbackType -->
       <typedef-decl name='CheckFailedCallbackType' type-id='type-id-157' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='205' column='1' id='type-id-158'/>
       <!-- bool __sanitizer::IsPowerOfTwo(__sanitizer::uptr) -->
       <function-decl name='IsPowerOfTwo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5335,13 +5335,8 @@ 
       <!-- bool -->
       <return type-id='type-id-112'/>
     </function-type>
-    <!-- void () -->
-    <function-type size-in-bits='64' id='type-id-160'>
-      <!-- void -->
-      <return type-id='type-id-27'/>
-    </function-type>
     <!-- void (const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) -->
-    <function-type size-in-bits='64' id='type-id-161'>
+    <function-type size-in-bits='64' id='type-id-160'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'int' -->
@@ -5355,6 +5350,11 @@ 
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
+    <!-- void () -->
+    <function-type size-in-bits='64' id='type-id-161'>
+      <!-- void -->
+      <return type-id='type-id-27'/>
+    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
@@ -6162,9 +6162,9 @@ 
     <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-206'/>
     <!-- sigaltstack* -->
     <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-223'/>
-    <!-- void (int, void*, void*)* -->
+    <!-- void (*)(int, void*, void*) -->
     <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
-    <!-- void (void*, typedef __sanitizer::uptr)* -->
+    <!-- void (*)(void*, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -6456,20 +6456,20 @@ 
       <!-- struct __sanitizer::__sanitizer_kernel_sigaction_t -->
       <class-decl name='__sanitizer_kernel_sigaction_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='423' column='1' id='type-id-213'>
         <member-type access='public'>
-          <!-- union {void (int, void*, void*)* sigaction; void (int)* handler;} -->
+          <!-- union {void (* sigaction)(int, void*, void*); void (* handler)(int);} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='424' column='1' id='type-id-230'>
             <data-member access='public'>
-              <!-- void (int, void*, void*)* sigaction -->
+              <!-- void (* sigaction)(int, void*, void*) -->
               <var-decl name='sigaction' type-id='type-id-225' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='425' column='1'/>
             </data-member>
             <data-member access='public'>
-              <!-- void (int)* handler -->
+              <!-- void (* handler)(int) -->
               <var-decl name='handler' type-id='type-id-231' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='426' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <!-- union {void (int, void*, void*)* sigaction; void (int)* handler;} -->
+          <!-- union {void (* sigaction)(int, void*, void*); void (* handler)(int);} -->
           <var-decl name='' type-id='type-id-230' visibility='default'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
@@ -6477,7 +6477,7 @@ 
           <var-decl name='sa_flags' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='428' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <!-- void ()* __sanitizer::__sanitizer_kernel_sigaction_t::sa_restorer -->
+          <!-- void (* __sanitizer::__sanitizer_kernel_sigaction_t::sa_restorer)(void) -->
           <var-decl name='sa_restorer' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='429' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
@@ -6699,7 +6699,7 @@ 
         <!-- typedef __sanitizer::uptr -->
         <return type-id='type-id-2'/>
       </function-decl>
-      <!-- typedef void (typedef __sanitizer::uptr, typedef __sanitizer::uptr, bool, __sanitizer::uptr*, typedef __sanitizer::uptr)* __sanitizer::fill_profile_f -->
+      <!-- typedef void (*)(__sanitizer::uptr, __sanitizer::uptr, bool, __sanitizer::uptr*, __sanitizer::uptr) __sanitizer::fill_profile_f -->
       <typedef-decl name='fill_profile_f' type-id='type-id-239' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_procmaps.h' line='119' column='1' id='type-id-240'/>
       <!-- bool __sanitizer::internal_iserror(__sanitizer::uptr, int*) -->
       <function-decl name='internal_iserror' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_syscall_linux_x86_64.inc' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6782,7 +6782,7 @@ 
         <var-decl name='__align' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='56' column='1'/>
       </data-member>
     </union-decl>
-    <!-- bool (const char*)* -->
+    <!-- bool (*)(const char*) -->
     <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
     <!-- const pthread_attr_t -->
     <qualified-type-def type-id='type-id-249' const='yes' id='type-id-252'/>
@@ -6798,7 +6798,7 @@ 
     <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-255'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
-      <!-- typedef bool (const char*)* __sanitizer::string_predicate_t -->
+      <!-- typedef bool (*)(const char*) __sanitizer::string_predicate_t -->
       <typedef-decl name='string_predicate_t' type-id='type-id-251' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='467' column='1' id='type-id-257'/>
       <!-- void __sanitizer::atomic_signal_fence(__sanitizer::memory_order) -->
       <function-decl name='atomic_signal_fence' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='18' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8065,9 +8065,9 @@ 
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
-    <!-- int atexit(void ()*) -->
+    <!-- int atexit(void (*)(void)) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-144'/>
       <!-- int -->
       <return type-id='type-id-6'/>
@@ -8129,7 +8129,7 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-    <!-- void (const char*)* -->
+    <!-- void (*)(const char*) -->
     <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -8169,7 +8169,7 @@ 
     <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-280'/>
     <!-- __sanitizer::StackDesc* -->
     <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <!-- bool (const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)* -->
+    <!-- bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&) -->
     <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair> -->
     <qualified-type-def type-id='type-id-272' const='yes' id='type-id-285'/>
@@ -8545,7 +8545,7 @@ 
         <!-- void -->
         <return type-id='type-id-27'/>
       </function-decl>
-      <!-- __sanitizer::uptr __sanitizer::InternalBinarySearch<__sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>, __sanitizer::StackDepotReverseMap::IdDescPair, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)>(const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>&, __sanitizer::uptr, __sanitizer::uptr, const __sanitizer::StackDepotReverseMap::IdDescPair&, bool (const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)*) -->
+      <!-- __sanitizer::uptr __sanitizer::InternalBinarySearch<__sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>, __sanitizer::StackDepotReverseMap::IdDescPair, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)>(const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>&, __sanitizer::uptr, __sanitizer::uptr, const __sanitizer::StackDepotReverseMap::IdDescPair&, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)) -->
       <function-decl name='InternalBinarySearch&lt;__sanitizer::InternalMmapVector&lt;__sanitizer::StackDepotReverseMap::IdDescPair&gt;, __sanitizer::StackDepotReverseMap::IdDescPair, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&amp;, const __sanitizer::StackDepotReverseMap::IdDescPair&amp;)&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>&' -->
         <parameter type-id='type-id-286'/>
@@ -8555,7 +8555,7 @@ 
         <parameter type-id='type-id-2'/>
         <!-- parameter of type 'const __sanitizer::StackDepotReverseMap::IdDescPair&' -->
         <parameter type-id='type-id-291'/>
-        <!-- parameter of type 'bool (const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)*' -->
+        <!-- parameter of type 'bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)' -->
         <parameter type-id='type-id-284'/>
         <!-- typedef __sanitizer::uptr -->
         <return type-id='type-id-2'/>
@@ -8842,7 +8842,7 @@ 
       </function-decl>
       <!-- typedef int __sanitizer::SuspendedThreadID -->
       <typedef-decl name='SuspendedThreadID' type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h' line='19' column='1' id='type-id-308'/>
-      <!-- typedef void (const __sanitizer::SuspendedThreadsList&, void*)* __sanitizer::StopTheWorldCallback -->
+      <!-- typedef void (*)(const __sanitizer::SuspendedThreadsList&, void*) __sanitizer::StopTheWorldCallback -->
       <typedef-decl name='StopTheWorldCallback' type-id='type-id-312' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h' line='54' column='1' id='type-id-310'/>
     </namespace-decl>
   </abi-instr>
@@ -8939,25 +8939,25 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-    <!-- typedef void (void*, const char*, int)* backtrace_error_callback -->
+    <!-- typedef void (*)(void*, const char*, int) backtrace_error_callback -->
     <typedef-decl name='backtrace_error_callback' type-id='type-id-313' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='82' column='1' id='type-id-26'/>
-    <!-- typedef int (void*, typedef uintptr_t, const char*, int, const char*)* backtrace_full_callback -->
+    <!-- typedef int (*)(void*, uintptr_t, const char*, int, const char*) backtrace_full_callback -->
     <typedef-decl name='backtrace_full_callback' type-id='type-id-314' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='110' column='1' id='type-id-30'/>
-    <!-- typedef void (void*, typedef uintptr_t, const char*, typedef uintptr_t, typedef uintptr_t)* backtrace_syminfo_callback -->
+    <!-- typedef void (*)(void*, uintptr_t, const char*, uintptr_t, uintptr_t) backtrace_syminfo_callback -->
     <typedef-decl name='backtrace_syminfo_callback' type-id='type-id-315' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='175' column='1' id='type-id-29'/>
-    <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
+    <!-- typedef void (*)(const char*, size_t, void*) demangle_callbackref -->
     <typedef-decl name='demangle_callbackref' type-id='type-id-316' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-83'/>
     <!-- typedef unsigned long int uintptr_t -->
     <typedef-decl name='uintptr_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-25'/>
     <!-- backtrace_state* -->
     <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-24'/>
-    <!-- int (void*, typedef uintptr_t, const char*, int, const char*)* -->
+    <!-- int (*)(void*, uintptr_t, const char*, int, const char*) -->
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-314'/>
-    <!-- void (const char*, typedef size_t, void*)* -->
+    <!-- void (*)(const char*, size_t, void*) -->
     <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-316'/>
-    <!-- void (void*, const char*, int)* -->
+    <!-- void (*)(void*, const char*, int) -->
     <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-313'/>
-    <!-- void (void*, typedef uintptr_t, const char*, typedef uintptr_t, typedef uintptr_t)* -->
+    <!-- void (*)(void*, uintptr_t, const char*, uintptr_t, uintptr_t) -->
     <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-315'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -9038,7 +9038,7 @@ 
     <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-327'/>
     <!-- __sanitizer::Symbolizer::SymbolizerScope* -->
     <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-149'/>
-    <!-- bool (const char*, typedef __sanitizer::u64, char*, int)* -->
+    <!-- bool (*)(const char*, __sanitizer::u64, char*, int) -->
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
     <!-- const __sanitizer::Symbolizer -->
     <qualified-type-def type-id='type-id-146' const='yes' id='type-id-330'/>
@@ -9185,7 +9185,7 @@ 
       <!-- class __sanitizer::InternalSymbolizer -->
       <class-decl name='InternalSymbolizer' size-in-bits='131072' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='321' column='1' id='type-id-321'>
         <member-type access='public'>
-          <!-- typedef bool (const char*, typedef __sanitizer::u64, char*, int)* __sanitizer::InternalSymbolizer::SanitizerSymbolizeFn -->
+          <!-- typedef bool (*)(const char*, __sanitizer::u64, char*, int) __sanitizer::InternalSymbolizer::SanitizerSymbolizeFn -->
           <typedef-decl name='SanitizerSymbolizeFn' type-id='type-id-329' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='323' column='1' id='type-id-331'/>
         </member-type>
         <data-member access='private' static='yes'>
@@ -9564,11 +9564,11 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::EndSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::EndSymbolizationHook -->
           <typedef-decl name='EndSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='111' column='1' id='type-id-150'/>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::StartSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::StartSymbolizationHook -->
           <typedef-decl name='StartSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='110' column='1' id='type-id-151'/>
         </member-type>
         <data-member access='private' static='yes'>
@@ -9835,7 +9835,7 @@ 
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
-      <!-- typedef __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* __sanitizer::ThreadContextFactory -->
+      <!-- typedef __sanitizer::ThreadContextBase* (*)(__sanitizer::u32) __sanitizer::ThreadContextFactory -->
       <typedef-decl name='ThreadContextFactory' type-id='type-id-332' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='71' column='1' id='type-id-333'/>
     </namespace-decl>
   </abi-instr>
@@ -10669,7 +10669,7 @@ 
     <!-- class AtExitContext -->
     <class-decl name='AtExitContext' size-in-bits='17536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='281' column='1' id='type-id-370'>
       <member-type access='public'>
-        <!-- typedef void ()* AtExitContext::atexit_t -->
+        <!-- typedef void (*)(void) AtExitContext::atexit_t -->
         <typedef-decl name='atexit_t' type-id='type-id-144' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='288' column='1' id='type-id-371'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -10681,7 +10681,7 @@ 
         <var-decl name='mtx_' type-id='type-id-372' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='333' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <!-- void ()* AtExitContext::stack_[128] -->
+        <!-- void (* AtExitContext::stack_[128])(void) -->
         <var-decl name='stack_' type-id='type-id-373' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='334' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8256'>
@@ -10999,20 +10999,20 @@ 
     <!-- struct sigaction_t -->
     <class-decl name='sigaction_t' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='91' column='1' id='type-id-400'>
       <member-type access='public'>
-        <!-- union {sighandler_t sa_handler; void (int, my_siginfo_t*, void*)* sa_sigaction;} -->
+        <!-- union {sighandler_t sa_handler; void (* sa_sigaction)(int, my_siginfo_t*, void*);} -->
         <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='92' column='1' id='type-id-401'>
           <data-member access='public'>
             <!-- sighandler_t sa_handler -->
             <var-decl name='sa_handler' type-id='type-id-402' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='93' column='1'/>
           </data-member>
           <data-member access='public'>
-            <!-- void (int, my_siginfo_t*, void*)* sa_sigaction -->
+            <!-- void (* sa_sigaction)(int, my_siginfo_t*, void*) -->
             <var-decl name='sa_sigaction' type-id='type-id-403' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='94' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- union {sighandler_t sa_handler; void (int, my_siginfo_t*, void*)* sa_sigaction;} -->
+        <!-- union {sighandler_t sa_handler; void (* sa_sigaction)(int, my_siginfo_t*, void*);} -->
         <var-decl name='' type-id='type-id-401' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -11024,7 +11024,7 @@ 
         <var-decl name='sa_flags' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- void ()* sigaction_t::sa_restorer -->
+        <!-- void (* sigaction_t::sa_restorer)(void) -->
         <var-decl name='sa_restorer' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='98' column='1'/>
       </data-member>
     </class-decl>
@@ -11064,645 +11064,645 @@ 
     <typedef-decl name='SIZE_T' type-id='type-id-2' filepath='../../.././libsanitizer/interception/interception.h' line='24' column='1' id='type-id-412'/>
     <!-- typedef __sanitizer::sptr SSIZE_T -->
     <typedef-decl name='SSIZE_T' type-id='type-id-413' filepath='../../.././libsanitizer/interception/interception.h' line='25' column='1' id='type-id-414'/>
-    <!-- typedef int (int)* __close_f -->
+    <!-- typedef int (*)(int) __close_f -->
     <typedef-decl name='__close_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' id='type-id-416'/>
-    <!-- typedef int (void (void*)*, void*, void*)* __cxa_atexit_f -->
+    <!-- typedef int (*)(void (*)(void*), void*, void*) __cxa_atexit_f -->
     <typedef-decl name='__cxa_atexit_f' type-id='type-id-417' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1' id='type-id-418'/>
-    <!-- typedef int (int, int, void*)* __fxstat64_f -->
+    <!-- typedef int (*)(int, int, void*) __fxstat64_f -->
     <typedef-decl name='__fxstat64_f' type-id='type-id-419' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1271' column='1' id='type-id-420'/>
-    <!-- typedef int (int, int, void*)* __fxstat_f -->
+    <!-- typedef int (*)(int, int, void*) __fxstat_f -->
     <typedef-decl name='__fxstat_f' type-id='type-id-419' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1257' column='1' id='type-id-421'/>
-    <!-- typedef int (void*, const char*, variadic parameter type)* __isoc99_fscanf_f -->
+    <!-- typedef int (*)(void*, const char*, ...) __isoc99_fscanf_f -->
     <typedef-decl name='__isoc99_fscanf_f' type-id='type-id-422' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1' id='type-id-423'/>
-    <!-- typedef int (const char*, variadic parameter type)* __isoc99_scanf_f -->
+    <!-- typedef int (*)(const char*, ...) __isoc99_scanf_f -->
     <typedef-decl name='__isoc99_scanf_f' type-id='type-id-424' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1' id='type-id-425'/>
-    <!-- typedef int (const char*, const char*, variadic parameter type)* __isoc99_sscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, ...) __isoc99_sscanf_f -->
     <typedef-decl name='__isoc99_sscanf_f' type-id='type-id-426' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1' id='type-id-427'/>
-    <!-- typedef int (void*, const char*, typedef __va_list_tag __va_list_tag*)* __isoc99_vfscanf_f -->
+    <!-- typedef int (*)(void*, const char*, typedef __va_list_tag __va_list_tag*) __isoc99_vfscanf_f -->
     <typedef-decl name='__isoc99_vfscanf_f' type-id='type-id-428' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' id='type-id-429'/>
-    <!-- typedef int (const char*, typedef __va_list_tag __va_list_tag*)* __isoc99_vscanf_f -->
+    <!-- typedef int (*)(const char*, typedef __va_list_tag __va_list_tag*) __isoc99_vscanf_f -->
     <typedef-decl name='__isoc99_vscanf_f' type-id='type-id-430' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' id='type-id-431'/>
-    <!-- typedef int (const char*, const char*, typedef __va_list_tag __va_list_tag*)* __isoc99_vsscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, typedef __va_list_tag __va_list_tag*) __isoc99_vsscanf_f -->
     <typedef-decl name='__isoc99_vsscanf_f' type-id='type-id-432' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' id='type-id-433'/>
-    <!-- typedef void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* __libc_memalign_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr, __sanitizer::uptr) __libc_memalign_f -->
     <typedef-decl name='__libc_memalign_f' type-id='type-id-434' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='487' column='1' id='type-id-435'/>
-    <!-- typedef int (int, const char*, void*)* __lxstat64_f -->
+    <!-- typedef int (*)(int, const char*, void*) __lxstat64_f -->
     <typedef-decl name='__lxstat64_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' id='type-id-437'/>
-    <!-- typedef int (int, const char*, void*)* __lxstat_f -->
+    <!-- typedef int (*)(int, const char*, void*) __lxstat_f -->
     <typedef-decl name='__lxstat_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' id='type-id-438'/>
-    <!-- typedef void (void*, bool)* __res_iclose_f -->
+    <!-- typedef void (*)(void*, bool) __res_iclose_f -->
     <typedef-decl name='__res_iclose_f' type-id='type-id-439' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1447' column='1' id='type-id-440'/>
-    <!-- typedef int (void*)* __sigsetjmp_f -->
+    <!-- typedef int (*)(void*) __sigsetjmp_f -->
     <typedef-decl name='__sigsetjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='457' column='1' id='type-id-442'/>
-    <!-- typedef int (int, char*, typedef SIZE_T)* __xpg_strerror_r_f -->
+    <!-- typedef int (*)(int, char*, SIZE_T) __xpg_strerror_r_f -->
     <typedef-decl name='__xpg_strerror_r_f' type-id='type-id-443' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' id='type-id-444'/>
-    <!-- typedef int (int, const char*, void*)* __xstat64_f -->
+    <!-- typedef int (*)(int, const char*, void*) __xstat64_f -->
     <typedef-decl name='__xstat64_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' id='type-id-445'/>
-    <!-- typedef int (int, const char*, void*)* __xstat_f -->
+    <!-- typedef int (*)(int, const char*, void*) __xstat_f -->
     <typedef-decl name='__xstat_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1217' column='1' id='type-id-446'/>
-    <!-- typedef void (int)* _exit_f -->
+    <!-- typedef void (*)(int) _exit_f -->
     <typedef-decl name='_exit_f' type-id='type-id-231' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' id='type-id-447'/>
-    <!-- typedef int (void*)* _setjmp_f -->
+    <!-- typedef int (*)(void*) _setjmp_f -->
     <typedef-decl name='_setjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='455' column='1' id='type-id-448'/>
-    <!-- typedef void (int)* abort_f -->
+    <!-- typedef void (*)(int) abort_f -->
     <typedef-decl name='abort_f' type-id='type-id-231' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' id='type-id-449'/>
-    <!-- typedef int (int, void*, unsigned int*, int)* accept4_f -->
+    <!-- typedef int (*)(int, void*, unsigned int*, int) accept4_f -->
     <typedef-decl name='accept4_f' type-id='type-id-450' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1' id='type-id-451'/>
-    <!-- typedef int (int, void*, unsigned int*)* accept_f -->
+    <!-- typedef int (*)(int, void*, unsigned int*) accept_f -->
     <typedef-decl name='accept_f' type-id='type-id-452' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1324' column='1' id='type-id-453'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_tm*)* asctime_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_tm*) asctime_f -->
     <typedef-decl name='asctime_f' type-id='type-id-454' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1' id='type-id-455'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_tm*, char*)* asctime_r_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_tm*, char*) asctime_r_f -->
     <typedef-decl name='asctime_r_f' type-id='type-id-456' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1' id='type-id-457'/>
-    <!-- typedef int (void ()*)* atexit_f -->
+    <!-- typedef int (*)(void (*)(void)) atexit_f -->
     <typedef-decl name='atexit_f' type-id='type-id-458' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1' id='type-id-459'/>
-    <!-- typedef int (void**, int)* backtrace_f -->
+    <!-- typedef int (*)(void**, int) backtrace_f -->
     <typedef-decl name='backtrace_f' type-id='type-id-460' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1' id='type-id-461'/>
-    <!-- typedef char** (void**, int)* backtrace_symbols_f -->
+    <!-- typedef char** (*)(void**, int) backtrace_symbols_f -->
     <typedef-decl name='backtrace_symbols_f' type-id='type-id-462' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1' id='type-id-463'/>
-    <!-- typedef int (int, void*, unsigned int)* bind_f -->
+    <!-- typedef int (*)(int, void*, unsigned int) bind_f -->
     <typedef-decl name='bind_f' type-id='type-id-464' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' id='type-id-465'/>
-    <!-- typedef void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* calloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr, __sanitizer::uptr) calloc_f -->
     <typedef-decl name='calloc_f' type-id='type-id-434' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='492' column='1' id='type-id-466'/>
-    <!-- typedef char* (const char*)* canonicalize_file_name_f -->
+    <!-- typedef char* (*)(const char*) canonicalize_file_name_f -->
     <typedef-decl name='canonicalize_file_name_f' type-id='type-id-467' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1791' column='1' id='type-id-468'/>
-    <!-- typedef void (void*)* cfree_f -->
+    <!-- typedef void (*)(void*) cfree_f -->
     <typedef-decl name='cfree_f' type-id='type-id-469' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='531' column='1' id='type-id-470'/>
-    <!-- typedef int (typedef __sanitizer::u32, void*)* clock_getres_f -->
+    <!-- typedef int (*)(__sanitizer::u32, void*) clock_getres_f -->
     <typedef-decl name='clock_getres_f' type-id='type-id-471' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='790' column='1' id='type-id-472'/>
-    <!-- typedef int (typedef __sanitizer::u32, void*)* clock_gettime_f -->
+    <!-- typedef int (*)(__sanitizer::u32, void*) clock_gettime_f -->
     <typedef-decl name='clock_gettime_f' type-id='type-id-471' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='799' column='1' id='type-id-473'/>
-    <!-- typedef int (typedef __sanitizer::u32, void*)* clock_settime_f -->
+    <!-- typedef int (*)(__sanitizer::u32, void*) clock_settime_f -->
     <typedef-decl name='clock_settime_f' type-id='type-id-471' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1' id='type-id-474'/>
-    <!-- typedef int (int)* close_f -->
+    <!-- typedef int (*)(int) close_f -->
     <typedef-decl name='close_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' id='type-id-475'/>
-    <!-- typedef typedef SIZE_T (int, char*, typedef SIZE_T)* confstr_f -->
+    <!-- typedef SIZE_T (*)(int, char*, SIZE_T) confstr_f -->
     <typedef-decl name='confstr_f' type-id='type-id-476' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' id='type-id-477'/>
-    <!-- typedef int (int, void*, unsigned int)* connect_f -->
+    <!-- typedef int (*)(int, void*, unsigned int) connect_f -->
     <typedef-decl name='connect_f' type-id='type-id-464' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' id='type-id-478'/>
-    <!-- typedef int (const char*, int)* creat64_f -->
+    <!-- typedef int (*)(const char*, int) creat64_f -->
     <typedef-decl name='creat64_f' type-id='type-id-479' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1' id='type-id-480'/>
-    <!-- typedef int (const char*, int)* creat_f -->
+    <!-- typedef int (*)(const char*, int) creat_f -->
     <typedef-decl name='creat_f' type-id='type-id-479' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1301' column='1' id='type-id-481'/>
-    <!-- typedef char* (unsigned long int*)* ctime_f -->
+    <!-- typedef char* (*)(unsigned long int*) ctime_f -->
     <typedef-decl name='ctime_f' type-id='type-id-482' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1' id='type-id-483'/>
-    <!-- typedef char* (unsigned long int*, char*)* ctime_r_f -->
+    <!-- typedef char* (*)(unsigned long int*, char*) ctime_r_f -->
     <typedef-decl name='ctime_r_f' type-id='type-id-484' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1' id='type-id-485'/>
-    <!-- typedef int (void*)* dlclose_f -->
+    <!-- typedef int (*)(void*) dlclose_f -->
     <typedef-decl name='dlclose_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' id='type-id-486'/>
-    <!-- typedef void* (const char*, int)* dlopen_f -->
+    <!-- typedef void* (*)(const char*, int) dlopen_f -->
     <typedef-decl name='dlopen_f' type-id='type-id-487' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1' id='type-id-488'/>
-    <!-- typedef int (void*, double*)* drand48_r_f -->
+    <!-- typedef int (*)(void*, double*) drand48_r_f -->
     <typedef-decl name='drand48_r_f' type-id='type-id-489' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1' id='type-id-490'/>
-    <!-- typedef int (int, int)* dup2_f -->
+    <!-- typedef int (*)(int, int) dup2_f -->
     <typedef-decl name='dup2_f' type-id='type-id-491' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' id='type-id-492'/>
-    <!-- typedef int (int, int, int)* dup3_f -->
+    <!-- typedef int (*)(int, int, int) dup3_f -->
     <typedef-decl name='dup3_f' type-id='type-id-493' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1333' column='1' id='type-id-494'/>
-    <!-- typedef int (int)* dup_f -->
+    <!-- typedef int (*)(int) dup_f -->
     <typedef-decl name='dup_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' id='type-id-495'/>
-    <!-- typedef int (int)* epoll_create1_f -->
+    <!-- typedef int (*)(int) epoll_create1_f -->
     <typedef-decl name='epoll_create1_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' id='type-id-496'/>
-    <!-- typedef int (int)* epoll_create_f -->
+    <!-- typedef int (*)(int) epoll_create_f -->
     <typedef-decl name='epoll_create_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' id='type-id-497'/>
-    <!-- typedef int (int, int, int, void*)* epoll_ctl_f -->
+    <!-- typedef int (*)(int, int, int, void*) epoll_ctl_f -->
     <typedef-decl name='epoll_ctl_f' type-id='type-id-498' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' id='type-id-499'/>
-    <!-- typedef int (int, void*, int, int)* epoll_wait_f -->
+    <!-- typedef int (*)(int, void*, int, int) epoll_wait_f -->
     <typedef-decl name='epoll_wait_f' type-id='type-id-500' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' id='type-id-501'/>
-    <!-- typedef __sanitizer::__sanitizer_ether_addr* (char*)* ether_aton_f -->
+    <!-- typedef __sanitizer::__sanitizer_ether_addr* (*)(char*) ether_aton_f -->
     <typedef-decl name='ether_aton_f' type-id='type-id-502' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2452' column='1' id='type-id-503'/>
-    <!-- typedef __sanitizer::__sanitizer_ether_addr* (char*, __sanitizer::__sanitizer_ether_addr*)* ether_aton_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_ether_addr* (*)(char*, __sanitizer::__sanitizer_ether_addr*) ether_aton_r_f -->
     <typedef-decl name='ether_aton_r_f' type-id='type-id-504' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1' id='type-id-505'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_ether_addr*)* ether_hostton_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_ether_addr*) ether_hostton_f -->
     <typedef-decl name='ether_hostton_f' type-id='type-id-506' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1' id='type-id-507'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_ether_addr*, char*)* ether_line_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_ether_addr*, char*) ether_line_f -->
     <typedef-decl name='ether_line_f' type-id='type-id-508' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1' id='type-id-509'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_ether_addr*)* ether_ntoa_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_ether_addr*) ether_ntoa_f -->
     <typedef-decl name='ether_ntoa_f' type-id='type-id-510' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1' id='type-id-511'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_ether_addr*, char*)* ether_ntoa_r_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_ether_addr*, char*) ether_ntoa_r_f -->
     <typedef-decl name='ether_ntoa_r_f' type-id='type-id-512' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1' id='type-id-513'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_ether_addr*)* ether_ntohost_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_ether_addr*) ether_ntohost_f -->
     <typedef-decl name='ether_ntohost_f' type-id='type-id-506' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' id='type-id-514'/>
-    <!-- typedef int (unsigned int, int)* eventfd_f -->
+    <!-- typedef int (*)(unsigned int, int) eventfd_f -->
     <typedef-decl name='eventfd_f' type-id='type-id-515' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1' id='type-id-516'/>
-    <!-- typedef int (void*)* fclose_f -->
+    <!-- typedef int (*)(void*) fclose_f -->
     <typedef-decl name='fclose_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1541' column='1' id='type-id-517'/>
-    <!-- typedef int (void*)* fflush_f -->
+    <!-- typedef int (*)(void*) fflush_f -->
     <typedef-decl name='fflush_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' id='type-id-518'/>
-    <!-- typedef void* (char*, char*)* fopen_f -->
+    <!-- typedef void* (*)(char*, char*) fopen_f -->
     <typedef-decl name='fopen_f' type-id='type-id-519' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1512' column='1' id='type-id-520'/>
-    <!-- typedef int (int)* fork_f -->
+    <!-- typedef int (*)(int) fork_f -->
     <typedef-decl name='fork_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' id='type-id-521'/>
-    <!-- typedef typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* fread_f -->
+    <!-- typedef __sanitizer::uptr (*)(void*, __sanitizer::uptr, __sanitizer::uptr, void*) fread_f -->
     <typedef-decl name='fread_f' type-id='type-id-522' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1554' column='1' id='type-id-523'/>
-    <!-- typedef void (void*)* free_f -->
+    <!-- typedef void (*)(void*) free_f -->
     <typedef-decl name='free_f' type-id='type-id-469' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='521' column='1' id='type-id-524'/>
-    <!-- typedef void* (char*, char*, void*)* freopen_f -->
+    <!-- typedef void* (*)(char*, char*, void*) freopen_f -->
     <typedef-decl name='freopen_f' type-id='type-id-525' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1524' column='1' id='type-id-526'/>
-    <!-- typedef double (double, int*)* frexp_f -->
+    <!-- typedef double (*)(double, int*) frexp_f -->
     <typedef-decl name='frexp_f' type-id='type-id-527' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='164' column='1' id='type-id-528'/>
-    <!-- typedef float (float, int*)* frexpf_f -->
+    <!-- typedef float (*)(float, int*) frexpf_f -->
     <typedef-decl name='frexpf_f' type-id='type-id-529' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='178' column='1' id='type-id-530'/>
-    <!-- typedef long double (long double, int*)* frexpl_f -->
+    <!-- typedef long double (*)(long double, int*) frexpl_f -->
     <typedef-decl name='frexpl_f' type-id='type-id-531' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='186' column='1' id='type-id-532'/>
-    <!-- typedef int (void*, const char*, variadic parameter type)* fscanf_f -->
+    <!-- typedef int (*)(void*, const char*, ...) fscanf_f -->
     <typedef-decl name='fscanf_f' type-id='type-id-422' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='622' column='1' id='type-id-533'/>
-    <!-- typedef int (int, void*)* fstat64_f -->
+    <!-- typedef int (*)(int, void*) fstat64_f -->
     <typedef-decl name='fstat64_f' type-id='type-id-534' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1278' column='1' id='type-id-535'/>
-    <!-- typedef int (int, void*)* fstat_f -->
+    <!-- typedef int (*)(int, void*) fstat_f -->
     <typedef-decl name='fstat_f' type-id='type-id-534' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1264' column='1' id='type-id-536'/>
-    <!-- typedef int (int, void*)* fstatfs64_f -->
+    <!-- typedef int (*)(int, void*) fstatfs64_f -->
     <typedef-decl name='fstatfs64_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2370' column='1' id='type-id-537'/>
-    <!-- typedef int (int, void*)* fstatfs_f -->
+    <!-- typedef int (*)(int, void*) fstatfs_f -->
     <typedef-decl name='fstatfs_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2347' column='1' id='type-id-538'/>
-    <!-- typedef int (int, void*)* fstatvfs64_f -->
+    <!-- typedef int (*)(int, void*) fstatvfs64_f -->
     <typedef-decl name='fstatvfs64_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1' id='type-id-539'/>
-    <!-- typedef int (int, void*)* fstatvfs_f -->
+    <!-- typedef int (*)(int, void*) fstatvfs_f -->
     <typedef-decl name='fstatvfs_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2393' column='1' id='type-id-540'/>
-    <!-- typedef typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* fwrite_f -->
+    <!-- typedef __sanitizer::uptr (*)(void*, __sanitizer::uptr, __sanitizer::uptr, void*) fwrite_f -->
     <typedef-decl name='fwrite_f' type-id='type-id-522' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' id='type-id-541'/>
-    <!-- typedef char* (int)* get_current_dir_name_f -->
+    <!-- typedef char* (*)(int) get_current_dir_name_f -->
     <typedef-decl name='get_current_dir_name_f' type-id='type-id-542' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' id='type-id-543'/>
-    <!-- typedef int (void*, void*, void*, void*)* getaddrinfo_f -->
+    <!-- typedef int (*)(void*, void*, void*, void*) getaddrinfo_f -->
     <typedef-decl name='getaddrinfo_f' type-id='type-id-544' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1' id='type-id-545'/>
-    <!-- typedef char* (char*, typedef SIZE_T)* getcwd_f -->
+    <!-- typedef char* (*)(char*, SIZE_T) getcwd_f -->
     <typedef-decl name='getcwd_f' type-id='type-id-546' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1' id='type-id-547'/>
-    <!-- typedef typedef SSIZE_T (char**, SIZE_T*, int, void*)* getdelim_f -->
+    <!-- typedef SSIZE_T (*)(char**, SIZE_T*, int, void*) getdelim_f -->
     <typedef-decl name='getdelim_f' type-id='type-id-548' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' id='type-id-549'/>
-    <!-- typedef int (int, __sanitizer::u32*)* getgroups_f -->
+    <!-- typedef int (*)(int, __sanitizer::u32*) getgroups_f -->
     <typedef-decl name='getgroups_f' type-id='type-id-550' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1' id='type-id-551'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (void*, int, int)* gethostbyaddr_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(void*, int, int) gethostbyaddr_f -->
     <typedef-decl name='gethostbyaddr_f' type-id='type-id-552' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1' id='type-id-553'/>
-    <!-- typedef int (void*, int, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostbyaddr_r_f -->
+    <!-- typedef int (*)(void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostbyaddr_r_f -->
     <typedef-decl name='gethostbyaddr_r_f' type-id='type-id-554' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1' id='type-id-555'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (char*, int)* gethostbyname2_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(char*, int) gethostbyname2_f -->
     <typedef-decl name='gethostbyname2_f' type-id='type-id-556' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1' id='type-id-557'/>
-    <!-- typedef int (char*, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostbyname2_r_f -->
+    <!-- typedef int (*)(char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostbyname2_r_f -->
     <typedef-decl name='gethostbyname2_r_f' type-id='type-id-558' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1' id='type-id-559'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (char*)* gethostbyname_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(char*) gethostbyname_f -->
     <typedef-decl name='gethostbyname_f' type-id='type-id-560' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' id='type-id-561'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostbyname_r_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostbyname_r_f -->
     <typedef-decl name='gethostbyname_r_f' type-id='type-id-562' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' id='type-id-563'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (int)* gethostent_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(int) gethostent_f -->
     <typedef-decl name='gethostent_f' type-id='type-id-564' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1' id='type-id-565'/>
-    <!-- typedef int (__sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostent_r_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostent_r_f -->
     <typedef-decl name='gethostent_r_f' type-id='type-id-566' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1' id='type-id-567'/>
-    <!-- typedef int (int, void*)* getitimer_f -->
+    <!-- typedef int (*)(int, void*) getitimer_f -->
     <typedef-decl name='getitimer_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' id='type-id-568'/>
-    <!-- typedef typedef SSIZE_T (char**, SIZE_T*, void*)* getline_f -->
+    <!-- typedef SSIZE_T (*)(char**, SIZE_T*, void*) getline_f -->
     <typedef-decl name='getline_f' type-id='type-id-569' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' id='type-id-570'/>
-    <!-- typedef __sanitizer::__sanitizer_mntent* (void*)* getmntent_f -->
+    <!-- typedef __sanitizer::__sanitizer_mntent* (*)(void*) getmntent_f -->
     <typedef-decl name='getmntent_f' type-id='type-id-571' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2312' column='1' id='type-id-572'/>
-    <!-- typedef __sanitizer::__sanitizer_mntent* (void*, __sanitizer::__sanitizer_mntent*, char*, int)* getmntent_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_mntent* (*)(void*, __sanitizer::__sanitizer_mntent*, char*, int) getmntent_r_f -->
     <typedef-decl name='getmntent_r_f' type-id='type-id-573' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1' id='type-id-574'/>
-    <!-- typedef int (int, void*, unsigned int*)* getpeername_f -->
+    <!-- typedef int (*)(int, void*, unsigned int*) getpeername_f -->
     <typedef-decl name='getpeername_f' type-id='type-id-452' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' id='type-id-575'/>
-    <!-- typedef int (int, void*, int*)* getsockname_f -->
+    <!-- typedef int (*)(int, void*, int*) getsockname_f -->
     <typedef-decl name='getsockname_f' type-id='type-id-576' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1' id='type-id-577'/>
-    <!-- typedef int (int, int, int, void*, int*)* getsockopt_f -->
+    <!-- typedef int (*)(int, int, int, void*, int*) getsockopt_f -->
     <typedef-decl name='getsockopt_f' type-id='type-id-578' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1' id='type-id-579'/>
-    <!-- typedef int (void*, void*)* gettimeofday_f -->
+    <!-- typedef int (*)(void*, void*) gettimeofday_f -->
     <typedef-decl name='gettimeofday_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1759' column='1' id='type-id-580'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*)* gmtime_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*) gmtime_f -->
     <typedef-decl name='gmtime_f' type-id='type-id-581' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='476' column='1' id='type-id-582'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*, void*)* gmtime_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*, void*) gmtime_r_f -->
     <typedef-decl name='gmtime_r_f' type-id='type-id-583' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1' id='type-id-584'/>
-    <!-- typedef typedef SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*)* iconv_f -->
+    <!-- typedef SIZE_T (*)(void*, char**, SIZE_T*, char**, SIZE_T*) iconv_f -->
     <typedef-decl name='iconv_f' type-id='type-id-585' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' id='type-id-586'/>
-    <!-- typedef int (const char*, void*)* inet_aton_f -->
+    <!-- typedef int (*)(const char*, void*) inet_aton_f -->
     <typedef-decl name='inet_aton_f' type-id='type-id-587' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1' id='type-id-588'/>
-    <!-- typedef char* (int, void*, char*, typedef __sanitizer::u32)* inet_ntop_f -->
+    <!-- typedef char* (*)(int, void*, char*, __sanitizer::u32) inet_ntop_f -->
     <typedef-decl name='inet_ntop_f' type-id='type-id-589' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1' id='type-id-590'/>
-    <!-- typedef int (int, const char*, void*)* inet_pton_f -->
+    <!-- typedef int (*)(int, const char*, void*) inet_pton_f -->
     <typedef-decl name='inet_pton_f' type-id='type-id-436' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1' id='type-id-591'/>
-    <!-- typedef int (char*, typedef __sanitizer::u32)* initgroups_f -->
+    <!-- typedef int (*)(char*, __sanitizer::u32) initgroups_f -->
     <typedef-decl name='initgroups_f' type-id='type-id-592' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1' id='type-id-593'/>
-    <!-- typedef int (int)* inotify_init1_f -->
+    <!-- typedef int (*)(int) inotify_init1_f -->
     <typedef-decl name='inotify_init1_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' id='type-id-594'/>
-    <!-- typedef int (int)* inotify_init_f -->
+    <!-- typedef int (*)(int) inotify_init_f -->
     <typedef-decl name='inotify_init_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' id='type-id-595'/>
-    <!-- typedef int (int, unsigned int, void*)* ioctl_f -->
+    <!-- typedef int (*)(int, unsigned int, void*) ioctl_f -->
     <typedef-decl name='ioctl_f' type-id='type-id-596' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' id='type-id-597'/>
     <!-- typedef void kernel_sigset_t -->
     <typedef-decl name='kernel_sigset_t' type-id='type-id-27' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='130' column='1' id='type-id-598'/>
-    <!-- typedef int (int, int)* kill_f -->
+    <!-- typedef int (*)(int, int) kill_f -->
     <typedef-decl name='kill_f' type-id='type-id-491' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1727' column='1' id='type-id-599'/>
-    <!-- typedef double (double)* lgamma_f -->
+    <!-- typedef double (*)(double) lgamma_f -->
     <typedef-decl name='lgamma_f' type-id='type-id-600' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2758' column='1' id='type-id-601'/>
-    <!-- typedef double (double, int*)* lgamma_r_f -->
+    <!-- typedef double (*)(double, int*) lgamma_r_f -->
     <typedef-decl name='lgamma_r_f' type-id='type-id-527' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2788' column='1' id='type-id-602'/>
-    <!-- typedef float (float)* lgammaf_f -->
+    <!-- typedef float (*)(float) lgammaf_f -->
     <typedef-decl name='lgammaf_f' type-id='type-id-603' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2765' column='1' id='type-id-604'/>
-    <!-- typedef float (float, int*)* lgammaf_r_f -->
+    <!-- typedef float (*)(float, int*) lgammaf_r_f -->
     <typedef-decl name='lgammaf_r_f' type-id='type-id-529' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2795' column='1' id='type-id-605'/>
-    <!-- typedef long double (long double)* lgammal_f -->
+    <!-- typedef long double (*)(long double) lgammal_f -->
     <typedef-decl name='lgammal_f' type-id='type-id-606' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2772' column='1' id='type-id-607'/>
-    <!-- typedef long double (long double, int*)* lgammal_r_f -->
+    <!-- typedef long double (*)(long double, int*) lgammal_r_f -->
     <typedef-decl name='lgammal_r_f' type-id='type-id-531' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2802' column='1' id='type-id-608'/>
-    <!-- typedef int (int, int)* listen_f -->
+    <!-- typedef int (*)(int, int) listen_f -->
     <typedef-decl name='listen_f' type-id='type-id-491' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1408' column='1' id='type-id-609'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*)* localtime_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*) localtime_f -->
     <typedef-decl name='localtime_f' type-id='type-id-581' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1' id='type-id-610'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*, void*)* localtime_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*, void*) localtime_r_f -->
     <typedef-decl name='localtime_r_f' type-id='type-id-583' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1' id='type-id-611'/>
     <!-- typedef long int long_t -->
     <typedef-decl name='long_t' type-id='type-id-41' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='79' column='1' id='type-id-612'/>
-    <!-- typedef void (__sanitizer::uptr*, int)* longjmp_f -->
+    <!-- typedef void (*)(__sanitizer::uptr*, int) longjmp_f -->
     <typedef-decl name='longjmp_f' type-id='type-id-613' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' id='type-id-614'/>
-    <!-- typedef int (void*, long int*)* lrand48_r_f -->
+    <!-- typedef int (*)(void*, long int*) lrand48_r_f -->
     <typedef-decl name='lrand48_r_f' type-id='type-id-615' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1' id='type-id-616'/>
-    <!-- typedef int (const char*, void*)* lstat64_f -->
+    <!-- typedef int (*)(const char*, void*) lstat64_f -->
     <typedef-decl name='lstat64_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1252' column='1' id='type-id-617'/>
-    <!-- typedef int (const char*, void*)* lstat_f -->
+    <!-- typedef int (*)(const char*, void*) lstat_f -->
     <typedef-decl name='lstat_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1242' column='1' id='type-id-618'/>
-    <!-- typedef void* (typedef __sanitizer::uptr)* malloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr) malloc_f -->
     <typedef-decl name='malloc_f' type-id='type-id-619' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='475' column='1' id='type-id-620'/>
-    <!-- typedef typedef __sanitizer::uptr (void*)* malloc_usable_size_f -->
+    <!-- typedef __sanitizer::uptr (*)(void*) malloc_usable_size_f -->
     <typedef-decl name='malloc_usable_size_f' type-id='type-id-621' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='541' column='1' id='type-id-622'/>
-    <!-- typedef typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, typedef SIZE_T, void*)* mbsnrtowcs_f -->
+    <!-- typedef SIZE_T (*)(wchar_t*, const char**, SIZE_T, SIZE_T, void*) mbsnrtowcs_f -->
     <typedef-decl name='mbsnrtowcs_f' type-id='type-id-623' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' id='type-id-624'/>
-    <!-- typedef typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, void*)* mbsrtowcs_f -->
+    <!-- typedef SIZE_T (*)(wchar_t*, const char**, SIZE_T, void*) mbsrtowcs_f -->
     <typedef-decl name='mbsrtowcs_f' type-id='type-id-625' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' id='type-id-626'/>
-    <!-- typedef typedef SIZE_T (wchar_t*, const char*, typedef SIZE_T)* mbstowcs_f -->
+    <!-- typedef SIZE_T (*)(wchar_t*, const char*, SIZE_T) mbstowcs_f -->
     <typedef-decl name='mbstowcs_f' type-id='type-id-627' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' id='type-id-628'/>
-    <!-- typedef void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* memalign_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr, __sanitizer::uptr) memalign_f -->
     <typedef-decl name='memalign_f' type-id='type-id-434' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='770' column='1' id='type-id-629'/>
-    <!-- typedef void* (void*, int, typedef __sanitizer::uptr)* memchr_f -->
+    <!-- typedef void* (*)(void*, int, __sanitizer::uptr) memchr_f -->
     <typedef-decl name='memchr_f' type-id='type-id-630' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='646' column='1' id='type-id-631'/>
-    <!-- typedef int (void*, void*, typedef __sanitizer::uptr)* memcmp_f -->
+    <!-- typedef int (*)(void*, void*, __sanitizer::uptr) memcmp_f -->
     <typedef-decl name='memcmp_f' type-id='type-id-632' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1' id='type-id-633'/>
-    <!-- typedef void* (void*, void*, typedef __sanitizer::uptr)* memcpy_f -->
+    <!-- typedef void* (*)(void*, void*, __sanitizer::uptr) memcpy_f -->
     <typedef-decl name='memcpy_f' type-id='type-id-634' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='626' column='1' id='type-id-635'/>
-    <!-- typedef void* (void*, void*, typedef __sanitizer::uptr)* memmove_f -->
+    <!-- typedef void* (*)(void*, void*, __sanitizer::uptr) memmove_f -->
     <typedef-decl name='memmove_f' type-id='type-id-634' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='660' column='1' id='type-id-636'/>
-    <!-- typedef void* (char*, int, typedef __sanitizer::uptr)* memrchr_f -->
+    <!-- typedef void* (*)(char*, int, __sanitizer::uptr) memrchr_f -->
     <typedef-decl name='memrchr_f' type-id='type-id-637' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1' id='type-id-638'/>
-    <!-- typedef void* (void*, int, typedef __sanitizer::uptr)* memset_f -->
+    <!-- typedef void* (*)(void*, int, __sanitizer::uptr) memset_f -->
     <typedef-decl name='memset_f' type-id='type-id-630' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='620' column='1' id='type-id-639'/>
-    <!-- typedef int (void*, typedef __sanitizer::uptr)* mlock_f -->
+    <!-- typedef int (*)(void*, __sanitizer::uptr) mlock_f -->
     <typedef-decl name='mlock_f' type-id='type-id-640' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1' id='type-id-641'/>
-    <!-- typedef int (int)* mlockall_f -->
+    <!-- typedef int (*)(int) mlockall_f -->
     <typedef-decl name='mlockall_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' id='type-id-642'/>
-    <!-- typedef void* (void*, typedef long_t, int, int, int, typedef __sanitizer::u64)* mmap64_f -->
+    <!-- typedef void* (*)(void*, long_t, int, int, int, __sanitizer::u64) mmap64_f -->
     <typedef-decl name='mmap64_f' type-id='type-id-643' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1' id='type-id-644'/>
-    <!-- typedef void* (void*, typedef long_t, int, int, int, unsigned int)* mmap_f -->
+    <!-- typedef void* (*)(void*, long_t, int, int, int, unsigned int) mmap_f -->
     <typedef-decl name='mmap_f' type-id='type-id-645' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' id='type-id-646'/>
-    <!-- typedef double (double, double*)* modf_f -->
+    <!-- typedef double (*)(double, double*) modf_f -->
     <typedef-decl name='modf_f' type-id='type-id-647' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1' id='type-id-648'/>
-    <!-- typedef float (float, float*)* modff_f -->
+    <!-- typedef float (*)(float, float*) modff_f -->
     <typedef-decl name='modff_f' type-id='type-id-649' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1' id='type-id-650'/>
-    <!-- typedef long double (long double, long double*)* modfl_f -->
+    <!-- typedef long double (*)(long double, long double*) modfl_f -->
     <typedef-decl name='modfl_f' type-id='type-id-651' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1' id='type-id-652'/>
-    <!-- typedef int (void*, typedef __sanitizer::uptr)* munlock_f -->
+    <!-- typedef int (*)(void*, __sanitizer::uptr) munlock_f -->
     <typedef-decl name='munlock_f' type-id='type-id-640' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1796' column='1' id='type-id-653'/>
-    <!-- typedef int ()* munlockall_f -->
+    <!-- typedef int (*)(void) munlockall_f -->
     <typedef-decl name='munlockall_f' type-id='type-id-654' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1806' column='1' id='type-id-655'/>
-    <!-- typedef int (void*, typedef long_t)* munmap_f -->
+    <!-- typedef int (*)(void*, long_t) munmap_f -->
     <typedef-decl name='munmap_f' type-id='type-id-656' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1' id='type-id-657'/>
-    <!-- typedef int (void*, void*)* nanosleep_f -->
+    <!-- typedef int (*)(void*, void*) nanosleep_f -->
     <typedef-decl name='nanosleep_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='252' column='1' id='type-id-658'/>
-    <!-- typedef int (void (int, void*)*, void*)* on_exit_f -->
+    <!-- typedef int (*)(void (*)(int, void*), void*) on_exit_f -->
     <typedef-decl name='on_exit_f' type-id='type-id-659' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1' id='type-id-660'/>
-    <!-- typedef int (const char*, int, int)* open64_f -->
+    <!-- typedef int (*)(const char*, int, int) open64_f -->
     <typedef-decl name='open64_f' type-id='type-id-661' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1' id='type-id-662'/>
-    <!-- typedef int (const char*, int, int)* open_f -->
+    <!-- typedef int (*)(const char*, int, int) open_f -->
     <typedef-decl name='open_f' type-id='type-id-661' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1285' column='1' id='type-id-663'/>
-    <!-- typedef void* (char*)* opendir_f -->
+    <!-- typedef void* (*)(char*) opendir_f -->
     <typedef-decl name='opendir_f' type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1599' column='1' id='type-id-665'/>
-    <!-- typedef int (int*, int)* pipe2_f -->
+    <!-- typedef int (*)(int*, int) pipe2_f -->
     <typedef-decl name='pipe2_f' type-id='type-id-666' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1' id='type-id-667'/>
-    <!-- typedef int (int*)* pipe_f -->
+    <!-- typedef int (*)(int*) pipe_f -->
     <typedef-decl name='pipe_f' type-id='type-id-668' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1458' column='1' id='type-id-669'/>
-    <!-- typedef int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, int)* poll_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) poll_f -->
     <typedef-decl name='poll_f' type-id='type-id-670' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' id='type-id-671'/>
-    <!-- typedef int (void**, typedef __sanitizer::uptr, typedef __sanitizer::uptr)* posix_memalign_f -->
+    <!-- typedef int (*)(void**, __sanitizer::uptr, __sanitizer::uptr) posix_memalign_f -->
     <typedef-decl name='posix_memalign_f' type-id='type-id-672' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1' id='type-id-673'/>
-    <!-- typedef int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*)* ppoll_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) ppoll_f -->
     <typedef-decl name='ppoll_f' type-id='type-id-674' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' id='type-id-675'/>
-    <!-- typedef int (int, unsigned long int, unsigned long int, unsigned long int, unsigned long int)* prctl_f -->
+    <!-- typedef int (*)(int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) prctl_f -->
     <typedef-decl name='prctl_f' type-id='type-id-676' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' id='type-id-677'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF64_T)* pread64_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T, OFF64_T) pread64_f -->
     <typedef-decl name='pread64_f' type-id='type-id-678' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' id='type-id-679'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* pread_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T, OFF_T) pread_f -->
     <typedef-decl name='pread_f' type-id='type-id-678' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' id='type-id-680'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF64_T)* preadv64_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) preadv64_f -->
     <typedef-decl name='preadv64_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' id='type-id-682'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* preadv_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) preadv_f -->
     <typedef-decl name='preadv_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' id='type-id-683'/>
-    <!-- typedef int (void*, typedef SIZE_T, void*)* pthread_attr_getaffinity_np_f -->
+    <!-- typedef int (*)(void*, SIZE_T, void*) pthread_attr_getaffinity_np_f -->
     <typedef-decl name='pthread_attr_getaffinity_np_f' type-id='type-id-684' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1' id='type-id-685'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getdetachstate_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getdetachstate_f -->
     <typedef-decl name='pthread_attr_getdetachstate_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='44' column='1' id='type-id-686'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getguardsize_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getguardsize_f -->
     <typedef-decl name='pthread_attr_getguardsize_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2576' column='1' id='type-id-687'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getinheritsched_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getinheritsched_f -->
     <typedef-decl name='pthread_attr_getinheritsched_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1' id='type-id-688'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getschedparam_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getschedparam_f -->
     <typedef-decl name='pthread_attr_getschedparam_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2577' column='1' id='type-id-689'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getschedpolicy_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getschedpolicy_f -->
     <typedef-decl name='pthread_attr_getschedpolicy_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2578' column='1' id='type-id-690'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getscope_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getscope_f -->
     <typedef-decl name='pthread_attr_getscope_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2579' column='1' id='type-id-691'/>
-    <!-- typedef int (void*, void**, SIZE_T*)* pthread_attr_getstack_f -->
+    <!-- typedef int (*)(void*, void**, SIZE_T*) pthread_attr_getstack_f -->
     <typedef-decl name='pthread_attr_getstack_f' type-id='type-id-692' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1' id='type-id-693'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getstacksize_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getstacksize_f -->
     <typedef-decl name='pthread_attr_getstacksize_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2580' column='1' id='type-id-694'/>
-    <!-- typedef int (void*)* pthread_barrier_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_barrier_destroy_f -->
     <typedef-decl name='pthread_barrier_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' id='type-id-695'/>
-    <!-- typedef int (void*, void*, unsigned int)* pthread_barrier_init_f -->
+    <!-- typedef int (*)(void*, void*, unsigned int) pthread_barrier_init_f -->
     <typedef-decl name='pthread_barrier_init_f' type-id='type-id-696' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' id='type-id-697'/>
-    <!-- typedef int (void*)* pthread_barrier_wait_f -->
+    <!-- typedef int (*)(void*) pthread_barrier_wait_f -->
     <typedef-decl name='pthread_barrier_wait_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' id='type-id-698'/>
-    <!-- typedef int (void*)* pthread_cond_broadcast_f -->
+    <!-- typedef int (*)(void*) pthread_cond_broadcast_f -->
     <typedef-decl name='pthread_cond_broadcast_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2271' column='1' id='type-id-699'/>
-    <!-- typedef int (void*)* pthread_cond_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_cond_destroy_f -->
     <typedef-decl name='pthread_cond_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' id='type-id-700'/>
-    <!-- typedef int (void*, void*)* pthread_cond_init_f -->
+    <!-- typedef int (*)(void*, void*) pthread_cond_init_f -->
     <typedef-decl name='pthread_cond_init_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2257' column='1' id='type-id-701'/>
-    <!-- typedef int (void*)* pthread_cond_signal_f -->
+    <!-- typedef int (*)(void*) pthread_cond_signal_f -->
     <typedef-decl name='pthread_cond_signal_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' id='type-id-702'/>
-    <!-- typedef int (void*, void*, void*)* pthread_cond_timedwait_f -->
+    <!-- typedef int (*)(void*, void*, void*) pthread_cond_timedwait_f -->
     <typedef-decl name='pthread_cond_timedwait_f' type-id='type-id-703' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1' id='type-id-704'/>
-    <!-- typedef int (void*, void*)* pthread_cond_wait_f -->
+    <!-- typedef int (*)(void*, void*) pthread_cond_wait_f -->
     <typedef-decl name='pthread_cond_wait_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2247' column='1' id='type-id-705'/>
-    <!-- typedef int (void*, void*, void* (void*)*, void*)* pthread_create_f -->
+    <!-- typedef int (*)(void*, void*, void* (*)(void*), void*) pthread_create_f -->
     <typedef-decl name='pthread_create_f' type-id='type-id-706' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1' id='type-id-707'/>
-    <!-- typedef int (void*)* pthread_detach_f -->
+    <!-- typedef int (*)(void*) pthread_detach_f -->
     <typedef-decl name='pthread_detach_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' id='type-id-708'/>
-    <!-- typedef int (typedef __sanitizer::uptr, int*, int*)* pthread_getschedparam_f -->
+    <!-- typedef int (*)(__sanitizer::uptr, int*, int*) pthread_getschedparam_f -->
     <typedef-decl name='pthread_getschedparam_f' type-id='type-id-709' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1' id='type-id-710'/>
-    <!-- typedef int (void*, void**)* pthread_join_f -->
+    <!-- typedef int (*)(void*, void**) pthread_join_f -->
     <typedef-decl name='pthread_join_f' type-id='type-id-711' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1' id='type-id-712'/>
-    <!-- typedef int (void*, int)* pthread_kill_f -->
+    <!-- typedef int (*)(void*, int) pthread_kill_f -->
     <typedef-decl name='pthread_kill_f' type-id='type-id-713' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1' id='type-id-714'/>
-    <!-- typedef int (void*)* pthread_mutex_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_destroy_f -->
     <typedef-decl name='pthread_mutex_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' id='type-id-715'/>
-    <!-- typedef int (void*, void*)* pthread_mutex_init_f -->
+    <!-- typedef int (*)(void*, void*) pthread_mutex_init_f -->
     <typedef-decl name='pthread_mutex_init_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='924' column='1' id='type-id-716'/>
-    <!-- typedef int (void*)* pthread_mutex_lock_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_lock_f -->
     <typedef-decl name='pthread_mutex_lock_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' id='type-id-717'/>
-    <!-- typedef int (void*, void*)* pthread_mutex_timedlock_f -->
+    <!-- typedef int (*)(void*, void*) pthread_mutex_timedlock_f -->
     <typedef-decl name='pthread_mutex_timedlock_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='959' column='1' id='type-id-718'/>
-    <!-- typedef int (void*)* pthread_mutex_trylock_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_trylock_f -->
     <typedef-decl name='pthread_mutex_trylock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' id='type-id-719'/>
-    <!-- typedef int (void*)* pthread_mutex_unlock_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_unlock_f -->
     <typedef-decl name='pthread_mutex_unlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2231' column='1' id='type-id-720'/>
-    <!-- typedef int (void*, void ()*)* pthread_once_f -->
+    <!-- typedef int (*)(void*, void (*)(void)) pthread_once_f -->
     <typedef-decl name='pthread_once_f' type-id='type-id-721' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' id='type-id-722'/>
-    <!-- typedef int (void*)* pthread_rwlock_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_destroy_f -->
     <typedef-decl name='pthread_rwlock_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' id='type-id-723'/>
-    <!-- typedef int (void*, void*)* pthread_rwlock_init_f -->
+    <!-- typedef int (*)(void*, void*) pthread_rwlock_init_f -->
     <typedef-decl name='pthread_rwlock_init_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1011' column='1' id='type-id-724'/>
-    <!-- typedef int (void*)* pthread_rwlock_rdlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_rdlock_f -->
     <typedef-decl name='pthread_rwlock_rdlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' id='type-id-725'/>
-    <!-- typedef int (void*, void*)* pthread_rwlock_timedrdlock_f -->
+    <!-- typedef int (*)(void*, void*) pthread_rwlock_timedrdlock_f -->
     <typedef-decl name='pthread_rwlock_timedrdlock_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1047' column='1' id='type-id-726'/>
-    <!-- typedef int (void*, void*)* pthread_rwlock_timedwrlock_f -->
+    <!-- typedef int (*)(void*, void*) pthread_rwlock_timedwrlock_f -->
     <typedef-decl name='pthread_rwlock_timedwrlock_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1074' column='1' id='type-id-727'/>
-    <!-- typedef int (void*)* pthread_rwlock_tryrdlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_tryrdlock_f -->
     <typedef-decl name='pthread_rwlock_tryrdlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' id='type-id-728'/>
-    <!-- typedef int (void*)* pthread_rwlock_trywrlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_trywrlock_f -->
     <typedef-decl name='pthread_rwlock_trywrlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' id='type-id-729'/>
-    <!-- typedef int (void*)* pthread_rwlock_unlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_unlock_f -->
     <typedef-decl name='pthread_rwlock_unlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' id='type-id-730'/>
-    <!-- typedef int (void*)* pthread_rwlock_wrlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_wrlock_f -->
     <typedef-decl name='pthread_rwlock_wrlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' id='type-id-731'/>
-    <!-- typedef int (typedef __sanitizer::uptr, const char*)* pthread_setname_np_f -->
+    <!-- typedef int (*)(__sanitizer::uptr, const char*) pthread_setname_np_f -->
     <typedef-decl name='pthread_setname_np_f' type-id='type-id-732' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2685' column='1' id='type-id-733'/>
-    <!-- typedef int (void*)* pthread_spin_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_spin_destroy_f -->
     <typedef-decl name='pthread_spin_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' id='type-id-734'/>
-    <!-- typedef int (void*, int)* pthread_spin_init_f -->
+    <!-- typedef int (*)(void*, int) pthread_spin_init_f -->
     <typedef-decl name='pthread_spin_init_f' type-id='type-id-713' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='968' column='1' id='type-id-735'/>
-    <!-- typedef int (void*)* pthread_spin_lock_f -->
+    <!-- typedef int (*)(void*) pthread_spin_lock_f -->
     <typedef-decl name='pthread_spin_lock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' id='type-id-736'/>
-    <!-- typedef int (void*)* pthread_spin_trylock_f -->
+    <!-- typedef int (*)(void*) pthread_spin_trylock_f -->
     <typedef-decl name='pthread_spin_trylock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' id='type-id-737'/>
-    <!-- typedef int (void*)* pthread_spin_unlock_f -->
+    <!-- typedef int (*)(void*) pthread_spin_unlock_f -->
     <typedef-decl name='pthread_spin_unlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' id='type-id-738'/>
-    <!-- typedef typedef __sanitizer::uptr (int, int, void*, void*)* ptrace_f -->
+    <!-- typedef __sanitizer::uptr (*)(int, int, void*, void*) ptrace_f -->
     <typedef-decl name='ptrace_f' type-id='type-id-739' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' id='type-id-740'/>
-    <!-- typedef int (const char*)* puts_f -->
+    <!-- typedef int (*)(const char*) puts_f -->
     <typedef-decl name='puts_f' type-id='type-id-741' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' id='type-id-742'/>
-    <!-- typedef void* (typedef __sanitizer::uptr)* pvalloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr) pvalloc_f -->
     <typedef-decl name='pvalloc_f' type-id='type-id-619' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='780' column='1' id='type-id-743'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef OFF64_T, typedef OFF64_T)* pwrite64_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, OFF64_T, OFF64_T) pwrite64_f -->
     <typedef-decl name='pwrite64_f' type-id='type-id-744' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' id='type-id-745'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* pwrite_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T, OFF_T) pwrite_f -->
     <typedef-decl name='pwrite_f' type-id='type-id-678' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' id='type-id-746'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF64_T)* pwritev64_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) pwritev64_f -->
     <typedef-decl name='pwritev64_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' id='type-id-747'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* pwritev_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) pwritev_f -->
     <typedef-decl name='pwritev_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' id='type-id-748'/>
-    <!-- typedef int (int)* raise_f -->
+    <!-- typedef int (*)(int) raise_f -->
     <typedef-decl name='raise_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' id='type-id-749'/>
-    <!-- typedef int (void*, __sanitizer::u32*)* random_r_f -->
+    <!-- typedef int (*)(void*, __sanitizer::u32*) random_r_f -->
     <typedef-decl name='random_r_f' type-id='type-id-750' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1' id='type-id-751'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T)* read_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T) read_f -->
     <typedef-decl name='read_f' type-id='type-id-752' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' id='type-id-753'/>
-    <!-- typedef __sanitizer::__sanitizer_dirent64* (void*)* readdir64_f -->
+    <!-- typedef __sanitizer::__sanitizer_dirent64* (*)(void*) readdir64_f -->
     <typedef-decl name='readdir64_f' type-id='type-id-754' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1' id='type-id-755'/>
-    <!-- typedef int (void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**)* readdir64_r_f -->
+    <!-- typedef int (*)(void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) readdir64_r_f -->
     <typedef-decl name='readdir64_r_f' type-id='type-id-756' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1' id='type-id-757'/>
-    <!-- typedef __sanitizer::__sanitizer_dirent* (void*)* readdir_f -->
+    <!-- typedef __sanitizer::__sanitizer_dirent* (*)(void*) readdir_f -->
     <typedef-decl name='readdir_f' type-id='type-id-758' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1' id='type-id-759'/>
-    <!-- typedef int (void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**)* readdir_r_f -->
+    <!-- typedef int (*)(void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) readdir_r_f -->
     <typedef-decl name='readdir_r_f' type-id='type-id-760' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1' id='type-id-761'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* readv_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int) readv_f -->
     <typedef-decl name='readv_f' type-id='type-id-762' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' id='type-id-763'/>
-    <!-- typedef void* (void*, typedef __sanitizer::uptr)* realloc_f -->
+    <!-- typedef void* (*)(void*, __sanitizer::uptr) realloc_f -->
     <typedef-decl name='realloc_f' type-id='type-id-764' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='508' column='1' id='type-id-765'/>
-    <!-- typedef char* (const char*, char*)* realpath_f -->
+    <!-- typedef char* (*)(const char*, char*) realpath_f -->
     <typedef-decl name='realpath_f' type-id='type-id-766' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1767' column='1' id='type-id-767'/>
-    <!-- typedef typedef long_t (int, void*, typedef long_t, int)* recv_f -->
+    <!-- typedef long_t (*)(int, void*, long_t, int) recv_f -->
     <typedef-decl name='recv_f' type-id='type-id-768' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' id='type-id-769'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int)* recvmsg_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_msghdr*, int) recvmsg_f -->
     <typedef-decl name='recvmsg_f' type-id='type-id-770' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' id='type-id-771'/>
-    <!-- typedef double (double, double, int*)* remquo_f -->
+    <!-- typedef double (*)(double, double, int*) remquo_f -->
     <typedef-decl name='remquo_f' type-id='type-id-772' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2727' column='1' id='type-id-773'/>
-    <!-- typedef float (float, float, int*)* remquof_f -->
+    <!-- typedef float (*)(float, float, int*) remquof_f -->
     <typedef-decl name='remquof_f' type-id='type-id-774' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2734' column='1' id='type-id-775'/>
-    <!-- typedef long double (long double, long double, int*)* remquol_f -->
+    <!-- typedef long double (*)(long double, long double, int*) remquol_f -->
     <typedef-decl name='remquol_f' type-id='type-id-776' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2741' column='1' id='type-id-777'/>
-    <!-- typedef int (char*)* rmdir_f -->
+    <!-- typedef int (*)(char*) rmdir_f -->
     <typedef-decl name='rmdir_f' type-id='type-id-778' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1' id='type-id-779'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**)* scandir64_compar_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**) scandir64_compar_f -->
     <typedef-decl name='scandir64_compar_f' type-id='type-id-780' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1943' column='1' id='type-id-781'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_dirent64***, typedef scandir64_filter_f, typedef scandir64_compar_f)* scandir64_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) scandir64_f -->
     <typedef-decl name='scandir64_f' type-id='type-id-782' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1' id='type-id-783'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent64*)* scandir64_filter_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent64*) scandir64_filter_f -->
     <typedef-decl name='scandir64_filter_f' type-id='type-id-784' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1942' column='1' id='type-id-785'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**)* scandir_compar_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**) scandir_compar_f -->
     <typedef-decl name='scandir_compar_f' type-id='type-id-786' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1890' column='1' id='type-id-787'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_dirent***, typedef scandir_filter_f, typedef scandir_compar_f)* scandir_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) scandir_f -->
     <typedef-decl name='scandir_f' type-id='type-id-788' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1' id='type-id-789'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent*)* scandir_filter_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent*) scandir_filter_f -->
     <typedef-decl name='scandir_filter_f' type-id='type-id-790' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1889' column='1' id='type-id-791'/>
-    <!-- typedef int (const char*, variadic parameter type)* scanf_f -->
+    <!-- typedef int (*)(const char*, ...) scanf_f -->
     <typedef-decl name='scanf_f' type-id='type-id-424' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' id='type-id-792'/>
-    <!-- typedef int (int, typedef SIZE_T, void*)* sched_getaffinity_f -->
+    <!-- typedef int (*)(int, SIZE_T, void*) sched_getaffinity_f -->
     <typedef-decl name='sched_getaffinity_f' type-id='type-id-793' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' id='type-id-794'/>
-    <!-- typedef int (void*)* sem_destroy_f -->
+    <!-- typedef int (*)(void*) sem_destroy_f -->
     <typedef-decl name='sem_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' id='type-id-795'/>
-    <!-- typedef int (void*, int*)* sem_getvalue_f -->
+    <!-- typedef int (*)(void*, int*) sem_getvalue_f -->
     <typedef-decl name='sem_getvalue_f' type-id='type-id-796' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1' id='type-id-797'/>
-    <!-- typedef int (void*, int, unsigned int)* sem_init_f -->
+    <!-- typedef int (*)(void*, int, unsigned int) sem_init_f -->
     <typedef-decl name='sem_init_f' type-id='type-id-798' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1' id='type-id-799'/>
-    <!-- typedef int (void*)* sem_post_f -->
+    <!-- typedef int (*)(void*) sem_post_f -->
     <typedef-decl name='sem_post_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' id='type-id-800'/>
-    <!-- typedef int (void*, void*)* sem_timedwait_f -->
+    <!-- typedef int (*)(void*, void*) sem_timedwait_f -->
     <typedef-decl name='sem_timedwait_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1192' column='1' id='type-id-801'/>
-    <!-- typedef int (void*)* sem_trywait_f -->
+    <!-- typedef int (*)(void*) sem_trywait_f -->
     <typedef-decl name='sem_trywait_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' id='type-id-802'/>
-    <!-- typedef int (void*)* sem_wait_f -->
+    <!-- typedef int (*)(void*) sem_wait_f -->
     <typedef-decl name='sem_wait_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' id='type-id-803'/>
-    <!-- typedef typedef long_t (int, void*, typedef long_t, int)* send_f -->
+    <!-- typedef long_t (*)(int, void*, long_t, int) send_f -->
     <typedef-decl name='send_f' type-id='type-id-768' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' id='type-id-804'/>
-    <!-- typedef typedef long_t (int, void*, int)* sendmsg_f -->
+    <!-- typedef long_t (*)(int, void*, int) sendmsg_f -->
     <typedef-decl name='sendmsg_f' type-id='type-id-805' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' id='type-id-806'/>
-    <!-- typedef int (int, void*, void*)* setitimer_f -->
+    <!-- typedef int (*)(int, void*, void*) setitimer_f -->
     <typedef-decl name='setitimer_f' type-id='type-id-807' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1' id='type-id-808'/>
-    <!-- typedef int (void*)* setjmp_f -->
+    <!-- typedef int (*)(void*) setjmp_f -->
     <typedef-decl name='setjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='454' column='1' id='type-id-809'/>
-    <!-- typedef char* (int, char*)* setlocale_f -->
+    <!-- typedef char* (*)(int, char*) setlocale_f -->
     <typedef-decl name='setlocale_f' type-id='type-id-810' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1' id='type-id-811'/>
-    <!-- typedef int (int, int, void*)* shmctl_f -->
+    <!-- typedef int (*)(int, int, void*) shmctl_f -->
     <typedef-decl name='shmctl_f' type-id='type-id-419' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1' id='type-id-812'/>
-    <!-- typedef int (int, sigaction_t*, sigaction_t*)* sigaction_f -->
+    <!-- typedef int (*)(int, sigaction_t*, sigaction_t*) sigaction_f -->
     <typedef-decl name='sigaction_f' type-id='type-id-813' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' id='type-id-814'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*)* sigemptyset_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*) sigemptyset_f -->
     <typedef-decl name='sigemptyset_f' type-id='type-id-815' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1' id='type-id-816'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*)* sigfillset_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*) sigfillset_f -->
     <typedef-decl name='sigfillset_f' type-id='type-id-815' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='53' column='1' id='type-id-817'/>
-    <!-- typedef void (int)* sighandler_t -->
+    <!-- typedef void (*)(int) sighandler_t -->
     <typedef-decl name='sighandler_t' type-id='type-id-231' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='87' column='1' id='type-id-402'/>
-    <!-- typedef void (__sanitizer::uptr*, int)* siglongjmp_f -->
+    <!-- typedef void (*)(__sanitizer::uptr*, int) siglongjmp_f -->
     <typedef-decl name='siglongjmp_f' type-id='type-id-613' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' id='type-id-818'/>
-    <!-- typedef typedef sighandler_t (int, typedef sighandler_t)* signal_f -->
+    <!-- typedef sighandler_t (*)(int, sighandler_t) signal_f -->
     <typedef-decl name='signal_f' type-id='type-id-819' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' id='type-id-820'/>
-    <!-- typedef int (int, void*, int)* signalfd_f -->
+    <!-- typedef int (*)(int, void*, int) signalfd_f -->
     <typedef-decl name='signalfd_f' type-id='type-id-821' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' id='type-id-822'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*)* sigpending_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*) sigpending_f -->
     <typedef-decl name='sigpending_f' type-id='type-id-815' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' id='type-id-823'/>
-    <!-- typedef int (int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*)* sigprocmask_f -->
+    <!-- typedef int (*)(int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) sigprocmask_f -->
     <typedef-decl name='sigprocmask_f' type-id='type-id-824' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1' id='type-id-825'/>
-    <!-- typedef int (void*)* sigsetjmp_f -->
+    <!-- typedef int (*)(void*) sigsetjmp_f -->
     <typedef-decl name='sigsetjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='456' column='1' id='type-id-826'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_sigset_t*)* sigsuspend_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_sigset_t*) sigsuspend_f -->
     <typedef-decl name='sigsuspend_f' type-id='type-id-827' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' id='type-id-828'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*, void*, void*)* sigtimedwait_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*, void*, void*) sigtimedwait_f -->
     <typedef-decl name='sigtimedwait_f' type-id='type-id-829' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1' id='type-id-830'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*, int*)* sigwait_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*, int*) sigwait_f -->
     <typedef-decl name='sigwait_f' type-id='type-id-831' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1' id='type-id-832'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*, void*)* sigwaitinfo_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*, void*) sigwaitinfo_f -->
     <typedef-decl name='sigwaitinfo_f' type-id='type-id-833' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' id='type-id-834'/>
-    <!-- typedef void (double, double*, double*)* sincos_f -->
+    <!-- typedef void (*)(double, double*, double*) sincos_f -->
     <typedef-decl name='sincos_f' type-id='type-id-835' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1' id='type-id-836'/>
-    <!-- typedef void (float, float*, float*)* sincosf_f -->
+    <!-- typedef void (*)(float, float*, float*) sincosf_f -->
     <typedef-decl name='sincosf_f' type-id='type-id-837' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' id='type-id-838'/>
-    <!-- typedef void (long double, long double*, long double*)* sincosl_f -->
+    <!-- typedef void (*)(long double, long double*, long double*) sincosl_f -->
     <typedef-decl name='sincosl_f' type-id='type-id-839' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1' id='type-id-840'/>
-    <!-- typedef unsigned int (unsigned int)* sleep_f -->
+    <!-- typedef unsigned int (*)(unsigned int) sleep_f -->
     <typedef-decl name='sleep_f' type-id='type-id-841' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' id='type-id-842'/>
-    <!-- typedef int (int, int, int)* socket_f -->
+    <!-- typedef int (*)(int, int, int) socket_f -->
     <typedef-decl name='socket_f' type-id='type-id-493' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1' id='type-id-843'/>
-    <!-- typedef int (int, int, int, int*)* socketpair_f -->
+    <!-- typedef int (*)(int, int, int, int*) socketpair_f -->
     <typedef-decl name='socketpair_f' type-id='type-id-844' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1' id='type-id-845'/>
-    <!-- typedef int (const char*, const char*, variadic parameter type)* sscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, ...) sscanf_f -->
     <typedef-decl name='sscanf_f' type-id='type-id-426' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='625' column='1' id='type-id-846'/>
-    <!-- typedef int (const char*, void*)* stat64_f -->
+    <!-- typedef int (*)(const char*, void*) stat64_f -->
     <typedef-decl name='stat64_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1232' column='1' id='type-id-847'/>
-    <!-- typedef int (const char*, void*)* stat_f -->
+    <!-- typedef int (*)(const char*, void*) stat_f -->
     <typedef-decl name='stat_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1222' column='1' id='type-id-848'/>
-    <!-- typedef int (char*, void*)* statfs64_f -->
+    <!-- typedef int (*)(char*, void*) statfs64_f -->
     <typedef-decl name='statfs64_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2362' column='1' id='type-id-850'/>
-    <!-- typedef int (char*, void*)* statfs_f -->
+    <!-- typedef int (*)(char*, void*) statfs_f -->
     <typedef-decl name='statfs_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2339' column='1' id='type-id-851'/>
-    <!-- typedef int (char*, void*)* statvfs64_f -->
+    <!-- typedef int (*)(char*, void*) statvfs64_f -->
     <typedef-decl name='statvfs64_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1' id='type-id-852'/>
-    <!-- typedef int (char*, void*)* statvfs_f -->
+    <!-- typedef int (*)(char*, void*) statvfs_f -->
     <typedef-decl name='statvfs_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2385' column='1' id='type-id-853'/>
-    <!-- typedef int (const char*, const char*)* strcasecmp_f -->
+    <!-- typedef int (*)(const char*, const char*) strcasecmp_f -->
     <typedef-decl name='strcasecmp_f' type-id='type-id-854' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1' id='type-id-855'/>
-    <!-- typedef char* (char*, int)* strchr_f -->
+    <!-- typedef char* (*)(char*, int) strchr_f -->
     <typedef-decl name='strchr_f' type-id='type-id-856' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='667' column='1' id='type-id-857'/>
-    <!-- typedef char* (char*, int)* strchrnul_f -->
+    <!-- typedef char* (*)(char*, int) strchrnul_f -->
     <typedef-decl name='strchrnul_f' type-id='type-id-856' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='675' column='1' id='type-id-858'/>
-    <!-- typedef int (const char*, const char*)* strcmp_f -->
+    <!-- typedef int (*)(const char*, const char*) strcmp_f -->
     <typedef-decl name='strcmp_f' type-id='type-id-854' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='82' column='1' id='type-id-859'/>
-    <!-- typedef char* (char*, const char*)* strcpy_f -->
+    <!-- typedef char* (*)(char*, const char*) strcpy_f -->
     <typedef-decl name='strcpy_f' type-id='type-id-860' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='689' column='1' id='type-id-861'/>
-    <!-- typedef char* (const char*)* strdup_f -->
+    <!-- typedef char* (*)(const char*) strdup_f -->
     <typedef-decl name='strdup_f' type-id='type-id-467' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='715' column='1' id='type-id-862'/>
-    <!-- typedef char* (int)* strerror_f -->
+    <!-- typedef char* (*)(int) strerror_f -->
     <typedef-decl name='strerror_f' type-id='type-id-542' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1' id='type-id-863'/>
-    <!-- typedef char* (int, char*, typedef SIZE_T)* strerror_r_f -->
+    <!-- typedef char* (*)(int, char*, SIZE_T) strerror_r_f -->
     <typedef-decl name='strerror_r_f' type-id='type-id-864' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' id='type-id-865'/>
-    <!-- typedef typedef __sanitizer::uptr (const char*)* strlen_f -->
+    <!-- typedef __sanitizer::uptr (*)(const char*) strlen_f -->
     <typedef-decl name='strlen_f' type-id='type-id-866' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1' id='type-id-867'/>
-    <!-- typedef int (const char*, const char*, typedef SIZE_T)* strncasecmp_f -->
+    <!-- typedef int (*)(const char*, const char*, SIZE_T) strncasecmp_f -->
     <typedef-decl name='strncasecmp_f' type-id='type-id-868' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1' id='type-id-869'/>
-    <!-- typedef int (const char*, const char*, typedef __sanitizer::uptr)* strncmp_f -->
+    <!-- typedef int (*)(const char*, const char*, __sanitizer::uptr) strncmp_f -->
     <typedef-decl name='strncmp_f' type-id='type-id-868' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' id='type-id-870'/>
-    <!-- typedef char* (char*, char*, typedef __sanitizer::uptr)* strncpy_f -->
+    <!-- typedef char* (*)(char*, char*, __sanitizer::uptr) strncpy_f -->
     <typedef-decl name='strncpy_f' type-id='type-id-871' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1' id='type-id-872'/>
-    <!-- typedef char* (char*, char*, __sanitizer::__sanitizer_tm*)* strptime_f -->
+    <!-- typedef char* (*)(char*, char*, __sanitizer::__sanitizer_tm*) strptime_f -->
     <typedef-decl name='strptime_f' type-id='type-id-873' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1' id='type-id-874'/>
-    <!-- typedef char* (char*, int)* strrchr_f -->
+    <!-- typedef char* (*)(char*, int) strrchr_f -->
     <typedef-decl name='strrchr_f' type-id='type-id-856' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1' id='type-id-875'/>
-    <!-- typedef const char* (const char*, const char*)* strstr_f -->
+    <!-- typedef const char* (*)(const char*, const char*) strstr_f -->
     <typedef-decl name='strstr_f' type-id='type-id-876' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='705' column='1' id='type-id-877'/>
-    <!-- typedef typedef INTMAX_T (const char*, char**, int)* strtoimax_f -->
+    <!-- typedef INTMAX_T (*)(const char*, char**, int) strtoimax_f -->
     <typedef-decl name='strtoimax_f' type-id='type-id-878' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' id='type-id-879'/>
-    <!-- typedef typedef INTMAX_T (const char*, char**, int)* strtoumax_f -->
+    <!-- typedef INTMAX_T (*)(const char*, char**, int) strtoumax_f -->
     <typedef-decl name='strtoumax_f' type-id='type-id-878' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' id='type-id-880'/>
-    <!-- typedef int (void*)* sysinfo_f -->
+    <!-- typedef int (*)(void*) sysinfo_f -->
     <typedef-decl name='sysinfo_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' id='type-id-881'/>
-    <!-- typedef int (int, void*)* tcgetattr_f -->
+    <!-- typedef int (*)(int, void*) tcgetattr_f -->
     <typedef-decl name='tcgetattr_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1' id='type-id-882'/>
-    <!-- typedef char* (char*, char*)* tempnam_f -->
+    <!-- typedef char* (*)(char*, char*) tempnam_f -->
     <typedef-decl name='tempnam_f' type-id='type-id-883' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1' id='type-id-884'/>
-    <!-- typedef char* (const char*)* textdomain_f -->
+    <!-- typedef char* (*)(const char*) textdomain_f -->
     <typedef-decl name='textdomain_f' type-id='type-id-467' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1' id='type-id-885'/>
-    <!-- typedef unsigned long int (unsigned long int*)* time_f -->
+    <!-- typedef unsigned long int (*)(unsigned long int*) time_f -->
     <typedef-decl name='time_f' type-id='type-id-886' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='432' column='1' id='type-id-887'/>
-    <!-- typedef typedef __sanitizer::__sanitizer_clock_t (void*)* times_f -->
+    <!-- typedef __sanitizer::__sanitizer_clock_t (*)(void*) times_f -->
     <typedef-decl name='times_f' type-id='type-id-888' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' id='type-id-889'/>
-    <!-- typedef char* (char*)* tmpnam_f -->
+    <!-- typedef char* (*)(char*) tmpnam_f -->
     <typedef-decl name='tmpnam_f' type-id='type-id-890' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2639' column='1' id='type-id-891'/>
-    <!-- typedef char* (char*)* tmpnam_r_f -->
+    <!-- typedef char* (*)(char*) tmpnam_r_f -->
     <typedef-decl name='tmpnam_r_f' type-id='type-id-890' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1' id='type-id-892'/>
-    <!-- typedef int (char*)* unlink_f -->
+    <!-- typedef int (*)(char*) unlink_f -->
     <typedef-decl name='unlink_f' type-id='type-id-778' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' id='type-id-893'/>
-    <!-- typedef int (typedef long_t)* usleep_f -->
+    <!-- typedef int (*)(long_t) usleep_f -->
     <typedef-decl name='usleep_f' type-id='type-id-894' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' id='type-id-895'/>
-    <!-- typedef void* (typedef __sanitizer::uptr)* valloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr) valloc_f -->
     <typedef-decl name='valloc_f' type-id='type-id-619' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='775' column='1' id='type-id-896'/>
-    <!-- typedef int (void*, const char*, typedef __va_list_tag __va_list_tag*)* vfscanf_f -->
+    <!-- typedef int (*)(void*, const char*, typedef __va_list_tag __va_list_tag*) vfscanf_f -->
     <typedef-decl name='vfscanf_f' type-id='type-id-428' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' id='type-id-897'/>
-    <!-- typedef int (const char*, typedef __va_list_tag __va_list_tag*)* vscanf_f -->
+    <!-- typedef int (*)(const char*, typedef __va_list_tag __va_list_tag*) vscanf_f -->
     <typedef-decl name='vscanf_f' type-id='type-id-430' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' id='type-id-898'/>
-    <!-- typedef int (const char*, const char*, typedef __va_list_tag __va_list_tag*)* vsscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, typedef __va_list_tag __va_list_tag*) vsscanf_f -->
     <typedef-decl name='vsscanf_f' type-id='type-id-432' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1' id='type-id-899'/>
-    <!-- typedef int (int*, int, void*)* wait3_f -->
+    <!-- typedef int (*)(int*, int, void*) wait3_f -->
     <typedef-decl name='wait3_f' type-id='type-id-900' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1' id='type-id-901'/>
-    <!-- typedef int (int, int*, int, void*)* wait4_f -->
+    <!-- typedef int (*)(int, int*, int, void*) wait4_f -->
     <typedef-decl name='wait4_f' type-id='type-id-902' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' id='type-id-903'/>
-    <!-- typedef int (int*)* wait_f -->
+    <!-- typedef int (*)(int*) wait_f -->
     <typedef-decl name='wait_f' type-id='type-id-668' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1' id='type-id-904'/>
-    <!-- typedef int (int, int, void*, int)* waitid_f -->
+    <!-- typedef int (*)(int, int, void*, int) waitid_f -->
     <typedef-decl name='waitid_f' type-id='type-id-905' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' id='type-id-906'/>
-    <!-- typedef int (int, int*, int)* waitpid_f -->
+    <!-- typedef int (*)(int, int*, int) waitpid_f -->
     <typedef-decl name='waitpid_f' type-id='type-id-907' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' id='type-id-908'/>
-    <!-- typedef typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, typedef SIZE_T, void*)* wcsnrtombs_f -->
+    <!-- typedef SIZE_T (*)(char*, const wchar_t**, SIZE_T, SIZE_T, void*) wcsnrtombs_f -->
     <typedef-decl name='wcsnrtombs_f' type-id='type-id-909' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' id='type-id-910'/>
-    <!-- typedef typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, void*)* wcsrtombs_f -->
+    <!-- typedef SIZE_T (*)(char*, const wchar_t**, SIZE_T, void*) wcsrtombs_f -->
     <typedef-decl name='wcsrtombs_f' type-id='type-id-911' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' id='type-id-912'/>
-    <!-- typedef typedef SIZE_T (char*, const wchar_t*, typedef SIZE_T)* wcstombs_f -->
+    <!-- typedef SIZE_T (*)(char*, const wchar_t*, SIZE_T) wcstombs_f -->
     <typedef-decl name='wcstombs_f' type-id='type-id-913' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' id='type-id-914'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_wordexp_t*, int)* wordexp_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_wordexp_t*, int) wordexp_f -->
     <typedef-decl name='wordexp_f' type-id='type-id-915' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1' id='type-id-916'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T)* write_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T) write_f -->
     <typedef-decl name='write_f' type-id='type-id-752' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' id='type-id-917'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* writev_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int) writev_f -->
     <typedef-decl name='writev_f' type-id='type-id-762' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' id='type-id-918'/>
     <!-- unsigned char[6] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='48' id='type-id-919'>
@@ -11734,7 +11734,7 @@ 
       <!-- <anonymous range>[16] -->
       <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-46' id='type-id-923'/>
     </array-type-def>
-    <!-- void ()*[128] -->
+    <!-- void (*[128])(void) -->
     <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='8192' id='type-id-373'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-361'/>
@@ -11745,8 +11745,42 @@ 
     <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-374'/>
     <!-- BlockingCall* -->
     <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-386'/>
+    <!-- INTMAX_T (*)(const char*, char**, int) -->
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-878'/>
+    <!-- SIZE_T (*)(char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-909'/>
+    <!-- SIZE_T (*)(char*, const wchar_t**, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-911'/>
+    <!-- SIZE_T (*)(char*, const wchar_t*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-913'/>
+    <!-- SIZE_T (*)(int, char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-476'/>
+    <!-- SIZE_T (*)(void*, char**, SIZE_T*, char**, SIZE_T*) -->
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-585'/>
+    <!-- SIZE_T (*)(wchar_t*, const char**, SIZE_T, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-623'/>
+    <!-- SIZE_T (*)(wchar_t*, const char**, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-625'/>
+    <!-- SIZE_T (*)(wchar_t*, const char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-627'/>
     <!-- SIZE_T* -->
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-928'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-937'/>
+    <!-- SSIZE_T (*)(char**, SIZE_T*, int, void*) -->
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-548'/>
+    <!-- SSIZE_T (*)(char**, SIZE_T*, void*) -->
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-569'/>
+    <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int) -->
+    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-762'/>
+    <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-681'/>
+    <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_msghdr*, int) -->
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-770'/>
+    <!-- SSIZE_T (*)(int, void*, OFF64_T, OFF64_T) -->
+    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-744'/>
+    <!-- SSIZE_T (*)(int, void*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-752'/>
+    <!-- SSIZE_T (*)(int, void*, SIZE_T, OFF_T) -->
+    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-678'/>
     <!-- ScopedInterceptor* -->
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-377'/>
     <!-- ScopedSyscall* -->
@@ -11754,575 +11788,541 @@ 
     <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression*>* -->
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-190'/>
     <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>* -->
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
     <!-- __sanitizer::LibIgnore* -->
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
     <!-- __sanitizer::Suppression& -->
-    <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
     <!-- __sanitizer::Suppression** -->
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-189'/>
     <!-- __sanitizer::SuppressionContext* -->
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
+    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
     <!-- __sanitizer::__sanitizer___kernel_fd_set* -->
-    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-939'/>
+    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
     <!-- __sanitizer::__sanitizer___kernel_gid_t* -->
-    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-941'/>
+    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-958'/>
     <!-- __sanitizer::__sanitizer___kernel_loff_t* -->
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-959' size-in-bits='64' id='type-id-960'/>
     <!-- __sanitizer::__sanitizer___kernel_off_t* -->
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-945'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
     <!-- __sanitizer::__sanitizer___kernel_old_gid_t* -->
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-964'/>
     <!-- __sanitizer::__sanitizer___kernel_old_uid_t* -->
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
+    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-966'/>
     <!-- __sanitizer::__sanitizer___sysctl_args* -->
-    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-968'/>
+    <!-- __sanitizer::__sanitizer_clock_t (*)(void*) -->
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-888'/>
     <!-- __sanitizer::__sanitizer_dirent* -->
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-953'/>
-    <!-- __sanitizer::__sanitizer_dirent* (void*)* -->
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-758'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-971'/>
+    <!-- __sanitizer::__sanitizer_dirent* (*)(void*) -->
+    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-758'/>
     <!-- __sanitizer::__sanitizer_dirent** -->
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-955'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-973'/>
     <!-- __sanitizer::__sanitizer_dirent*** -->
-    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-974'/>
     <!-- __sanitizer::__sanitizer_dirent64* -->
-    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-958'/>
-    <!-- __sanitizer::__sanitizer_dirent64* (void*)* -->
-    <pointer-type-def type-id='type-id-959' size-in-bits='64' id='type-id-754'/>
+    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
+    <!-- __sanitizer::__sanitizer_dirent64* (*)(void*) -->
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-754'/>
     <!-- __sanitizer::__sanitizer_dirent64** -->
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-960'/>
+    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-978'/>
     <!-- __sanitizer::__sanitizer_dirent64*** -->
-    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-961'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
     <!-- __sanitizer::__sanitizer_ether_addr* -->
-    <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-963'/>
-    <!-- __sanitizer::__sanitizer_ether_addr* (char*)* -->
-    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-502'/>
-    <!-- __sanitizer::__sanitizer_ether_addr* (char*, __sanitizer::__sanitizer_ether_addr*)* -->
-    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-504'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
+    <!-- __sanitizer::__sanitizer_ether_addr* (*)(char*) -->
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-502'/>
+    <!-- __sanitizer::__sanitizer_ether_addr* (*)(char*, __sanitizer::__sanitizer_ether_addr*) -->
+    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-504'/>
     <!-- __sanitizer::__sanitizer_hostent* -->
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
-    <!-- __sanitizer::__sanitizer_hostent* (char*)* -->
-    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-560'/>
-    <!-- __sanitizer::__sanitizer_hostent* (char*, int)* -->
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-556'/>
-    <!-- __sanitizer::__sanitizer_hostent* (int)* -->
-    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-564'/>
-    <!-- __sanitizer::__sanitizer_hostent* (void*, int, int)* -->
-    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-552'/>
+    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-985'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(char*) -->
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-560'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(char*, int) -->
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-556'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(int) -->
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-564'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(void*, int, int) -->
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-552'/>
     <!-- __sanitizer::__sanitizer_hostent** -->
-    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-972'/>
+    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-990'/>
     <!-- __sanitizer::__sanitizer_io_event* -->
-    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-974'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-992'/>
     <!-- __sanitizer::__sanitizer_iocb* -->
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-994'/>
     <!-- __sanitizer::__sanitizer_iocb** -->
-    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-977'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
     <!-- __sanitizer::__sanitizer_iovec* -->
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
     <!-- __sanitizer::__sanitizer_kernel_sigset_t* -->
-    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-980'/>
+    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-998'/>
     <!-- __sanitizer::__sanitizer_mntent* -->
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-982'/>
-    <!-- __sanitizer::__sanitizer_mntent* (void*)* -->
-    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-571'/>
-    <!-- __sanitizer::__sanitizer_mntent* (void*, __sanitizer::__sanitizer_mntent*, char*, int)* -->
-    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-573'/>
+    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1000'/>
+    <!-- __sanitizer::__sanitizer_mntent* (*)(void*) -->
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-571'/>
+    <!-- __sanitizer::__sanitizer_mntent* (*)(void*, __sanitizer::__sanitizer_mntent*, char*, int) -->
+    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-573'/>
     <!-- __sanitizer::__sanitizer_msghdr* -->
-    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-986'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
     <!-- __sanitizer::__sanitizer_perf_event_attr* -->
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-988'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
     <!-- __sanitizer::__sanitizer_pollfd* -->
-    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-990'/>
+    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
     <!-- __sanitizer::__sanitizer_sigset_t* -->
-    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-1009'/>
     <!-- __sanitizer::__sanitizer_tm* -->
-    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-993'/>
-    <!-- __sanitizer::__sanitizer_tm* (unsigned long int*)* -->
-    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-581'/>
-    <!-- __sanitizer::__sanitizer_tm* (unsigned long int*, void*)* -->
-    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1011'/>
+    <!-- __sanitizer::__sanitizer_tm* (*)(unsigned long int*) -->
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-581'/>
+    <!-- __sanitizer::__sanitizer_tm* (*)(unsigned long int*, void*) -->
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-583'/>
     <!-- __sanitizer::__sanitizer_wordexp_t* -->
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1015'/>
     <!-- __sanitizer::atomic_uint32_t* -->
-    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
     <!-- __sanitizer::atomic_uint32_t::Type* -->
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-1000'/>
+    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-1018'/>
     <!-- __sanitizer::u32* -->
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1001'/>
+    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1019'/>
+    <!-- __sanitizer::uptr (*)(const char*) -->
+    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-866'/>
+    <!-- __sanitizer::uptr (*)(int, int, void*, void*) -->
+    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-739'/>
+    <!-- __sanitizer::uptr (*)(void*) -->
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-621'/>
+    <!-- __sanitizer::uptr (*)(void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-522'/>
     <!-- __tsan::ThreadState* const -->
     <qualified-type-def type-id='type-id-354' const='yes' id='type-id-376'/>
-    <!-- char* (__sanitizer::__sanitizer_ether_addr*)* -->
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-510'/>
-    <!-- char* (__sanitizer::__sanitizer_ether_addr*, char*)* -->
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-512'/>
-    <!-- char* (__sanitizer::__sanitizer_tm*)* -->
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-454'/>
-    <!-- char* (__sanitizer::__sanitizer_tm*, char*)* -->
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-456'/>
-    <!-- char* (char*)* -->
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-890'/>
-    <!-- char* (char*, char*)* -->
-    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-883'/>
-    <!-- char* (char*, char*, __sanitizer::__sanitizer_tm*)* -->
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-873'/>
-    <!-- char* (char*, char*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-871'/>
-    <!-- char* (char*, const char*)* -->
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-860'/>
-    <!-- char* (char*, int)* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-856'/>
-    <!-- char* (char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-546'/>
-    <!-- char* (const char*)* -->
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-467'/>
-    <!-- char* (const char*, char*)* -->
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-766'/>
-    <!-- char* (int)* -->
-    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-542'/>
-    <!-- char* (int, char*)* -->
-    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-810'/>
-    <!-- char* (int, char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-864'/>
-    <!-- char* (int, void*, char*, typedef __sanitizer::u32)* -->
-    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-589'/>
-    <!-- char* (unsigned long int*)* -->
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-482'/>
-    <!-- char* (unsigned long int*, char*)* -->
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-484'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_ether_addr*) -->
+    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-510'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_ether_addr*, char*) -->
+    <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-512'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_tm*) -->
+    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-454'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_tm*, char*) -->
+    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-456'/>
+    <!-- char* (*)(char*) -->
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-890'/>
+    <!-- char* (*)(char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-546'/>
+    <!-- char* (*)(char*, char*) -->
+    <pointer-type-def type-id='type-id-1030' size-in-bits='64' id='type-id-883'/>
+    <!-- char* (*)(char*, char*, __sanitizer::__sanitizer_tm*) -->
+    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-873'/>
+    <!-- char* (*)(char*, char*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-871'/>
+    <!-- char* (*)(char*, const char*) -->
+    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-860'/>
+    <!-- char* (*)(char*, int) -->
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-856'/>
+    <!-- char* (*)(const char*) -->
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-467'/>
+    <!-- char* (*)(const char*, char*) -->
+    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-766'/>
+    <!-- char* (*)(int) -->
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-542'/>
+    <!-- char* (*)(int, char*) -->
+    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-810'/>
+    <!-- char* (*)(int, char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-864'/>
+    <!-- char* (*)(int, void*, char*, __sanitizer::u32) -->
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-589'/>
+    <!-- char* (*)(unsigned long int*) -->
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-482'/>
+    <!-- char* (*)(unsigned long int*, char*) -->
+    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-484'/>
     <!-- char** -->
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-1021'/>
-    <!-- char** (void**, int)* -->
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-1043'/>
+    <!-- char** (*)(void**, int) -->
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-462'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression> -->
-    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-1023'/>
+    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-1045'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression>* -->
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1025'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1047'/>
     <!-- const __sanitizer::LibIgnore -->
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1026'/>
+    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1048'/>
     <!-- const __sanitizer::LibIgnore& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1026' size-in-bits='64' id='type-id-1027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1048' size-in-bits='64' id='type-id-1049'/>
     <!-- const __sanitizer::LibIgnore* -->
-    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1028'/>
+    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-1050'/>
     <!-- const __sanitizer::Suppression -->
-    <qualified-type-def type-id='type-id-933' const='yes' id='type-id-1029'/>
+    <qualified-type-def type-id='type-id-950' const='yes' id='type-id-1051'/>
     <!-- const __sanitizer::Suppression& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
     <!-- const __sanitizer::Suppression* -->
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1031'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1053'/>
     <!-- const __sanitizer::SuppressionContext -->
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1032'/>
+    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1054'/>
     <!-- const __sanitizer::SuppressionContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-1033'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
     <!-- const __sanitizer::SuppressionContext* -->
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1034'/>
+    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1056'/>
     <!-- const __sanitizer::__sanitizer_dirent -->
-    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1035'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1057'/>
     <!-- const __sanitizer::__sanitizer_dirent* -->
-    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
+    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
     <!-- const __sanitizer::__sanitizer_dirent** -->
-    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
     <!-- const __sanitizer::__sanitizer_dirent64 -->
-    <qualified-type-def type-id='type-id-957' const='yes' id='type-id-1038'/>
+    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1060'/>
     <!-- const __sanitizer::__sanitizer_dirent64* -->
-    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1039'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
     <!-- const __sanitizer::__sanitizer_dirent64** -->
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
+    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
     <!-- const __sanitizer::__sanitizer_iovec -->
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1041'/>
+    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-1063'/>
     <!-- const __sanitizer::__sanitizer_iovec* -->
-    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1064'/>
     <!-- const __sanitizer::__sanitizer_sigset_t -->
-    <qualified-type-def type-id='type-id-404' const='yes' id='type-id-1043'/>
+    <qualified-type-def type-id='type-id-404' const='yes' id='type-id-1065'/>
     <!-- const __sanitizer::__sanitizer_sigset_t* -->
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
-    <!-- const char* (const char*, const char*)* -->
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-876'/>
+    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-1066'/>
+    <!-- const char* (*)(const char*, const char*) -->
+    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-876'/>
     <!-- const ioctl_desc -->
-    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-1046'/>
+    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-1068'/>
     <!-- const ioctl_desc& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-392'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1068' size-in-bits='64' id='type-id-392'/>
     <!-- const ioctl_desc_compare -->
-    <qualified-type-def type-id='type-id-390' const='yes' id='type-id-1047'/>
+    <qualified-type-def type-id='type-id-390' const='yes' id='type-id-1069'/>
     <!-- const ioctl_desc_compare* -->
-    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-391'/>
     <!-- const kernel_sigset_t -->
-    <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1048'/>
+    <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1070'/>
     <!-- const std::nothrow_t -->
-    <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1050'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1072'/>
     <!-- const std::nothrow_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
     <!-- const volatile __sanitizer::atomic_uint32_t -->
-    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1053'/>
+    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1075'/>
     <!-- const volatile __sanitizer::atomic_uint32_t* -->
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-234'/>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1054'/>
+    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1076'/>
     <!-- const wchar_t* -->
-    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
     <!-- const wchar_t** -->
-    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1056'/>
-    <!-- double (double)* -->
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-600'/>
-    <!-- double (double, double*)* -->
-    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-647'/>
-    <!-- double (double, double, int*)* -->
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-772'/>
-    <!-- double (double, int*)* -->
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
+    <!-- double (*)(double) -->
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-600'/>
+    <!-- double (*)(double, double*) -->
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-647'/>
+    <!-- double (*)(double, double, int*) -->
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-772'/>
+    <!-- double (*)(double, int*) -->
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-527'/>
     <!-- double* -->
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-1061'/>
-    <!-- float (float)* -->
-    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-603'/>
-    <!-- float (float, float*)* -->
-    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-649'/>
-    <!-- float (float, float, int*)* -->
-    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-774'/>
-    <!-- float (float, int*)* -->
-    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-1083'/>
+    <!-- float (*)(float) -->
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-603'/>
+    <!-- float (*)(float, float*) -->
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-649'/>
+    <!-- float (*)(float, float, int*) -->
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-774'/>
+    <!-- float (*)(float, int*) -->
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-529'/>
     <!-- float* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1066'/>
-    <!-- int ()* -->
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-654'/>
-    <!-- int (__sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-566'/>
-    <!-- int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, int)* -->
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-670'/>
-    <!-- int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-674'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-815'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*, int*)* -->
-    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-831'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*, void*)* -->
-    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-833'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-829'/>
-    <!-- int (char*)* -->
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-778'/>
-    <!-- int (char*, __sanitizer::__sanitizer_dirent***, typedef scandir_filter_f, typedef scandir_compar_f)* -->
-    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-788'/>
-    <!-- int (char*, __sanitizer::__sanitizer_dirent64***, typedef scandir64_filter_f, typedef scandir64_compar_f)* -->
-    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-782'/>
-    <!-- int (char*, __sanitizer::__sanitizer_ether_addr*)* -->
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-506'/>
-    <!-- int (char*, __sanitizer::__sanitizer_ether_addr*, char*)* -->
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-508'/>
-    <!-- int (char*, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-562'/>
-    <!-- int (char*, __sanitizer::__sanitizer_wordexp_t*, int)* -->
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-915'/>
-    <!-- int (char*, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-558'/>
-    <!-- int (char*, typedef __sanitizer::u32)* -->
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-592'/>
-    <!-- int (char*, void*)* -->
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-849'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent*)* -->
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-790'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**)* -->
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-786'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent64*)* -->
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-784'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**)* -->
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-780'/>
-    <!-- int (const __sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-827'/>
-    <!-- int (const char*)* -->
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-741'/>
-    <!-- int (const char*, const char*)* -->
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-854'/>
-    <!-- int (const char*, const char*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-868'/>
-    <!-- int (const char*, const char*, typedef __va_list_tag __va_list_tag*)* -->
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-432'/>
-    <!-- int (const char*, const char*, variadic parameter type)* -->
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-426'/>
-    <!-- int (const char*, int)* -->
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-479'/>
-    <!-- int (const char*, int, int)* -->
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-661'/>
-    <!-- int (const char*, typedef __va_list_tag __va_list_tag*)* -->
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-430'/>
-    <!-- int (const char*, variadic parameter type)* -->
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-424'/>
-    <!-- int (const char*, void*)* -->
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-587'/>
-    <!-- int (int)* -->
-    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-415'/>
-    <!-- int (int*)* -->
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-668'/>
-    <!-- int (int*, int)* -->
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-666'/>
-    <!-- int (int*, int, void*)* -->
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-900'/>
-    <!-- int (int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-824'/>
-    <!-- int (int, __sanitizer::u32*)* -->
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-550'/>
-    <!-- int (int, char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-443'/>
-    <!-- int (int, const char*, void*)* -->
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-436'/>
-    <!-- int (int, int)* -->
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-491'/>
-    <!-- int (int, int*, int)* -->
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-907'/>
-    <!-- int (int, int*, int, void*)* -->
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-902'/>
-    <!-- int (int, int, int)* -->
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-493'/>
-    <!-- int (int, int, int, int*)* -->
-    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-844'/>
-    <!-- int (int, int, int, void*)* -->
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-498'/>
-    <!-- int (int, int, int, void*, int*)* -->
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-578'/>
-    <!-- int (int, int, void*)* -->
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-419'/>
-    <!-- int (int, int, void*, int)* -->
-    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-905'/>
-    <!-- int (int, sigaction_t*, sigaction_t*)* -->
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-813'/>
-    <!-- int (int, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-793'/>
-    <!-- int (int, unsigned int, void*)* -->
-    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-596'/>
-    <!-- int (int, unsigned long int, unsigned long int, unsigned long int, unsigned long int)* -->
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-676'/>
-    <!-- int (int, void*)* -->
-    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-534'/>
-    <!-- int (int, void*, int)* -->
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-821'/>
-    <!-- int (int, void*, int*)* -->
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-576'/>
-    <!-- int (int, void*, int, int)* -->
-    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-500'/>
-    <!-- int (int, void*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-464'/>
-    <!-- int (int, void*, unsigned int*)* -->
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-452'/>
-    <!-- int (int, void*, unsigned int*, int)* -->
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-450'/>
-    <!-- int (int, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-807'/>
-    <!-- int (typedef __sanitizer::u32, void*)* -->
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-471'/>
-    <!-- int (typedef __sanitizer::uptr, const char*)* -->
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-732'/>
-    <!-- int (typedef __sanitizer::uptr, int*, int*)* -->
-    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-709'/>
-    <!-- int (typedef long_t)* -->
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-894'/>
-    <!-- int (unsigned int, int)* -->
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-515'/>
-    <!-- int (void ()*)* -->
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-458'/>
-    <!-- int (void (int, void*)*, void*)* -->
-    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-659'/>
-    <!-- int (void (void*)*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-417'/>
-    <!-- int (void*)* -->
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1088'/>
+    <!-- int (*)(__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-566'/>
+    <!-- int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-670'/>
+    <!-- int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-674'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-815'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*, int*) -->
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-831'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*, void*) -->
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-833'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
+    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-829'/>
+    <!-- int (*)(__sanitizer::u32, void*) -->
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-471'/>
+    <!-- int (*)(__sanitizer::uptr, const char*) -->
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-732'/>
+    <!-- int (*)(__sanitizer::uptr, int*, int*) -->
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-709'/>
+    <!-- int (*)(char*) -->
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-778'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) -->
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-788'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) -->
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-782'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_ether_addr*) -->
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-506'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_ether_addr*, char*) -->
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-508'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-562'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_wordexp_t*, int) -->
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-915'/>
+    <!-- int (*)(char*, __sanitizer::u32) -->
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-592'/>
+    <!-- int (*)(char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-558'/>
+    <!-- int (*)(char*, void*) -->
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-849'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent*) -->
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-790'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**) -->
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-786'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent64*) -->
+    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-784'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**) -->
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-780'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-827'/>
+    <!-- int (*)(const char*) -->
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-741'/>
+    <!-- int (*)(const char*, ...) -->
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-424'/>
+    <!-- int (*)(const char*, const char*) -->
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-854'/>
+    <!-- int (*)(const char*, const char*, ...) -->
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-426'/>
+    <!-- int (*)(const char*, const char*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-868'/>
+    <!-- int (*)(const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-432'/>
+    <!-- int (*)(const char*, int) -->
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-479'/>
+    <!-- int (*)(const char*, int, int) -->
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-661'/>
+    <!-- int (*)(const char*, typedef __va_list_tag __va_list_tag*) -->
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-430'/>
+    <!-- int (*)(const char*, void*) -->
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-587'/>
+    <!-- int (*)(int) -->
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-415'/>
+    <!-- int (*)(int*) -->
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-668'/>
+    <!-- int (*)(int*, int) -->
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-666'/>
+    <!-- int (*)(int*, int, void*) -->
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-900'/>
+    <!-- int (*)(int, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-793'/>
+    <!-- int (*)(int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-824'/>
+    <!-- int (*)(int, __sanitizer::u32*) -->
+    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-550'/>
+    <!-- int (*)(int, char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-443'/>
+    <!-- int (*)(int, const char*, void*) -->
+    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-436'/>
+    <!-- int (*)(int, int) -->
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-491'/>
+    <!-- int (*)(int, int*, int) -->
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-907'/>
+    <!-- int (*)(int, int*, int, void*) -->
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-902'/>
+    <!-- int (*)(int, int, int) -->
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-493'/>
+    <!-- int (*)(int, int, int, int*) -->
+    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-844'/>
+    <!-- int (*)(int, int, int, void*) -->
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-498'/>
+    <!-- int (*)(int, int, int, void*, int*) -->
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-578'/>
+    <!-- int (*)(int, int, void*) -->
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-419'/>
+    <!-- int (*)(int, int, void*, int) -->
+    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-905'/>
+    <!-- int (*)(int, sigaction_t*, sigaction_t*) -->
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-813'/>
+    <!-- int (*)(int, unsigned int, void*) -->
+    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-596'/>
+    <!-- int (*)(int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-676'/>
+    <!-- int (*)(int, void*) -->
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-534'/>
+    <!-- int (*)(int, void*, int) -->
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-821'/>
+    <!-- int (*)(int, void*, int*) -->
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-576'/>
+    <!-- int (*)(int, void*, int, int) -->
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-500'/>
+    <!-- int (*)(int, void*, unsigned int) -->
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-464'/>
+    <!-- int (*)(int, void*, unsigned int*) -->
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-452'/>
+    <!-- int (*)(int, void*, unsigned int*, int) -->
+    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-450'/>
+    <!-- int (*)(int, void*, void*) -->
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-807'/>
+    <!-- int (*)(long_t) -->
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-894'/>
+    <!-- int (*)(unsigned int, int) -->
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-515'/>
+    <!-- int (*)(void (*)(int, void*), void*) -->
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-659'/>
+    <!-- int (*)(void (*)(void)) -->
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-458'/>
+    <!-- int (*)(void (*)(void*), void*, void*) -->
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-417'/>
+    <!-- int (*)(void) -->
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-654'/>
+    <!-- int (*)(void*) -->
     <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-441'/>
-    <!-- int (void**, int)* -->
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-460'/>
-    <!-- int (void**, typedef __sanitizer::uptr, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-672'/>
-    <!-- int (void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**)* -->
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-760'/>
-    <!-- int (void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**)* -->
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-756'/>
-    <!-- int (void*, __sanitizer::u32*)* -->
-    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-750'/>
-    <!-- int (void*, const char*, typedef __va_list_tag __va_list_tag*)* -->
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-428'/>
-    <!-- int (void*, const char*, variadic parameter type)* -->
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-422'/>
-    <!-- int (void*, double*)* -->
-    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-489'/>
-    <!-- int (void*, int)* -->
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-713'/>
-    <!-- int (void*, int*)* -->
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-796'/>
-    <!-- int (void*, int, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-554'/>
-    <!-- int (void*, int, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-798'/>
-    <!-- int (void*, long int*)* -->
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-615'/>
-    <!-- int (void*, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-684'/>
-    <!-- int (void*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-640'/>
-    <!-- int (void*, typedef long_t)* -->
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-656'/>
-    <!-- int (void*, void ()*)* -->
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-721'/>
-    <!-- int (void*, void*)* -->
+    <!-- int (*)(void**, __sanitizer::uptr, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-672'/>
+    <!-- int (*)(void**, int) -->
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-460'/>
+    <!-- int (*)(void*, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-684'/>
+    <!-- int (*)(void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) -->
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-760'/>
+    <!-- int (*)(void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) -->
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-756'/>
+    <!-- int (*)(void*, __sanitizer::u32*) -->
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-750'/>
+    <!-- int (*)(void*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-640'/>
+    <!-- int (*)(void*, const char*, ...) -->
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-422'/>
+    <!-- int (*)(void*, const char*, typedef __va_list_tag __va_list_tag*) -->
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-428'/>
+    <!-- int (*)(void*, double*) -->
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-489'/>
+    <!-- int (*)(void*, int) -->
+    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-713'/>
+    <!-- int (*)(void*, int*) -->
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-796'/>
+    <!-- int (*)(void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-554'/>
+    <!-- int (*)(void*, int, unsigned int) -->
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-798'/>
+    <!-- int (*)(void*, long int*) -->
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-615'/>
+    <!-- int (*)(void*, long_t) -->
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-656'/>
+    <!-- int (*)(void*, void (*)(void)) -->
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-721'/>
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-12'/>
-    <!-- int (void*, void**)* -->
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-711'/>
-    <!-- int (void*, void**, SIZE_T*)* -->
-    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-692'/>
-    <!-- int (void*, void*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-632'/>
-    <!-- int (void*, void*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-696'/>
-    <!-- int (void*, void*, void* (void*)*, void*)* -->
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-706'/>
-    <!-- int (void*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-703'/>
-    <!-- int (void*, void*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-544'/>
+    <!-- int (*)(void*, void**) -->
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-711'/>
+    <!-- int (*)(void*, void**, SIZE_T*) -->
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-692'/>
+    <!-- int (*)(void*, void*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-632'/>
+    <!-- int (*)(void*, void*, unsigned int) -->
+    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-696'/>
+    <!-- int (*)(void*, void*, void* (*)(void*), void*) -->
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-706'/>
+    <!-- int (*)(void*, void*, void*) -->
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-703'/>
+    <!-- int (*)(void*, void*, void*, void*) -->
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-544'/>
     <!-- ioctl_desc& -->
-    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1161'/>
-    <!-- ioctl_desc[500]* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-1162'/>
-    <!-- long double (long double)* -->
-    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-606'/>
-    <!-- long double (long double, int*)* -->
-    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-531'/>
-    <!-- long double (long double, long double*)* -->
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-651'/>
-    <!-- long double (long double, long double, int*)* -->
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-776'/>
+    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1183'/>
+    <!-- ioctl_desc(*)[500] -->
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-1184'/>
+    <!-- long double (*)(long double) -->
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-606'/>
+    <!-- long double (*)(long double, int*) -->
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-531'/>
+    <!-- long double (*)(long double, long double*) -->
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-651'/>
+    <!-- long double (*)(long double, long double, int*) -->
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-776'/>
     <!-- long double* -->
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1167'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1189'/>
     <!-- long int* -->
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-1168'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-1190'/>
+    <!-- long_t (*)(int, void*, int) -->
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-805'/>
+    <!-- long_t (*)(int, void*, long_t, int) -->
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-768'/>
     <!-- my_siginfo_t* -->
-    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-1169'/>
+    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-1193'/>
     <!-- sanitizer_kernel_iovec* -->
     <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-398'/>
     <!-- sanitizer_kernel_mmsghdr* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-1170'/>
+    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-1194'/>
     <!-- sanitizer_kernel_msghdr* -->
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1171'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1195'/>
     <!-- sanitizer_kernel_sockaddr* -->
-    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1172'/>
+    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1196'/>
     <!-- sigaction_t* -->
-    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1173'/>
-    <!-- typedef INTMAX_T (const char*, char**, int)* -->
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-878'/>
-    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-909'/>
-    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-911'/>
-    <!-- typedef SIZE_T (char*, const wchar_t*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-913'/>
-    <!-- typedef SIZE_T (int, char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-476'/>
-    <!-- typedef SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*)* -->
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-585'/>
-    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-623'/>
-    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-625'/>
-    <!-- typedef SIZE_T (wchar_t*, const char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-627'/>
-    <!-- typedef SSIZE_T (char**, SIZE_T*, int, void*)* -->
-    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-548'/>
-    <!-- typedef SSIZE_T (char**, SIZE_T*, void*)* -->
-    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-569'/>
-    <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* -->
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-762'/>
-    <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* -->
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-681'/>
-    <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int)* -->
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-770'/>
-    <!-- typedef SSIZE_T (int, void*, typedef OFF64_T, typedef OFF64_T)* -->
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-744'/>
-    <!-- typedef SSIZE_T (int, void*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-752'/>
-    <!-- typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* -->
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-678'/>
-    <!-- typedef __sanitizer::__sanitizer_clock_t (void*)* -->
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-888'/>
-    <!-- typedef __sanitizer::uptr (const char*)* -->
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-866'/>
-    <!-- typedef __sanitizer::uptr (int, int, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-739'/>
-    <!-- typedef __sanitizer::uptr (void*)* -->
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-621'/>
-    <!-- typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* -->
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1197'/>
+    <!-- sighandler_t (*)(int, sighandler_t) -->
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-819'/>
     <!-- typedef __va_list_tag __va_list_tag* -->
-    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1196'/>
-    <!-- typedef long_t (int, void*, int)* -->
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-805'/>
-    <!-- typedef long_t (int, void*, typedef long_t, int)* -->
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-768'/>
-    <!-- typedef sighandler_t (int, typedef sighandler_t)* -->
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-819'/>
-    <!-- unsigned int (unsigned int)* -->
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1199'/>
+    <!-- unsigned int (*)(unsigned int) -->
     <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-841'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-178'/>
-    <!-- unsigned long int (unsigned long int*)* -->
+    <!-- unsigned long int (*)(unsigned long int*) -->
     <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-886'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-137'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-144'/>
-    <!-- void (__sanitizer::uptr*, int)* -->
+    <!-- void (*)(__sanitizer::uptr*, int) -->
     <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-613'/>
-    <!-- void (double, double*, double*)* -->
+    <!-- void (*)(double, double*, double*) -->
     <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-835'/>
-    <!-- void (float, float*, float*)* -->
+    <!-- void (*)(float, float*, float*) -->
     <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-837'/>
-    <!-- void (int)* -->
+    <!-- void (*)(int) -->
     <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-231'/>
-    <!-- void (int, my_siginfo_t*, void*)* -->
+    <!-- void (*)(int, my_siginfo_t*, void*) -->
     <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-403'/>
-    <!-- void (int, void*)* -->
+    <!-- void (*)(int, void*) -->
     <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
-    <!-- void (long double, long double*, long double*)* -->
+    <!-- void (*)(long double, long double*, long double*) -->
     <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-839'/>
-    <!-- void (void*, bool)* -->
+    <!-- void (*)(void) -->
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-144'/>
+    <!-- void (*)(void*, bool) -->
     <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-439'/>
-    <!-- void* (char*)* -->
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-664'/>
-    <!-- void* (char*, char*)* -->
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-519'/>
-    <!-- void* (char*, char*, void*)* -->
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-525'/>
-    <!-- void* (char*, int, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-637'/>
-    <!-- void* (const char*, int)* -->
-    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-487'/>
-    <!-- void* (typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-619'/>
-    <!-- void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-434'/>
-    <!-- void* (void*)* -->
+    <!-- void* (*)(__sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-619'/>
+    <!-- void* (*)(__sanitizer::uptr, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-434'/>
+    <!-- void* (*)(char*) -->
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-664'/>
+    <!-- void* (*)(char*, char*) -->
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-519'/>
+    <!-- void* (*)(char*, char*, void*) -->
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-525'/>
+    <!-- void* (*)(char*, int, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-637'/>
+    <!-- void* (*)(const char*, int) -->
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-487'/>
+    <!-- void* (*)(void*) -->
     <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
-    <!-- void* (void*, int, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-630'/>
-    <!-- void* (void*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-764'/>
-    <!-- void* (void*, typedef long_t, int, int, int, typedef __sanitizer::u64)* -->
+    <!-- void* (*)(void*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-764'/>
+    <!-- void* (*)(void*, int, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-630'/>
+    <!-- void* (*)(void*, long_t, int, int, int, __sanitizer::u64) -->
     <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-643'/>
-    <!-- void* (void*, typedef long_t, int, int, int, unsigned int)* -->
+    <!-- void* (*)(void*, long_t, int, int, int, unsigned int) -->
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-645'/>
-    <!-- void* (void*, void*, typedef __sanitizer::uptr)* -->
+    <!-- void* (*)(void*, void*, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-634'/>
     <!-- volatile __sanitizer::atomic_uint32_t -->
-    <qualified-type-def type-id='type-id-998' volatile='yes' id='type-id-1052'/>
+    <qualified-type-def type-id='type-id-1016' volatile='yes' id='type-id-1074'/>
     <!-- volatile __sanitizer::atomic_uint32_t* -->
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-236'/>
     <!-- volatile __sanitizer::atomic_uint32_t::Type -->
     <qualified-type-def type-id='type-id-235' volatile='yes' id='type-id-1224'/>
     <!-- wchar_t* -->
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-1225'/>
     <!-- const kernel_sigset_t* -->
-    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-1226'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-1226'/>
     <!-- kernel_sigset_t* -->
     <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1227'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- struct std::nothrow_t -->
-      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='108' column='1' id='type-id-1049'/>
+      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='108' column='1' id='type-id-1071'/>
     </namespace-decl>
     <!-- namespace __interception -->
     <namespace-decl name='__interception'>
@@ -13069,7 +13069,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -13080,7 +13080,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <!-- parameter of type 'typedef OFF_T' -->
@@ -13093,7 +13093,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -13143,7 +13143,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -13154,7 +13154,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'typedef OFF_T' -->
@@ -13167,7 +13167,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -13202,7 +13202,7 @@ 
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_tm* __interceptor_localtime_r(unsigned long int*, void*) -->
     <function-decl name='__interceptor_localtime_r' mangled-name='__interceptor_localtime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_localtime_r'>
@@ -13211,14 +13211,14 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_tm* __interceptor_gmtime(unsigned long int*) -->
     <function-decl name='__interceptor_gmtime' mangled-name='__interceptor_gmtime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gmtime'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='476' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_tm* __interceptor_gmtime_r(unsigned long int*, void*) -->
     <function-decl name='__interceptor_gmtime_r' mangled-name='__interceptor_gmtime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gmtime_r'>
@@ -13227,7 +13227,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- char* __interceptor_ctime(unsigned long int*) -->
     <function-decl name='__interceptor_ctime' mangled-name='__interceptor_ctime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ctime'>
@@ -13248,14 +13248,14 @@ 
     <!-- char* __interceptor_asctime(__sanitizer::__sanitizer_tm*) -->
     <function-decl name='__interceptor_asctime' mangled-name='__interceptor_asctime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_asctime'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1'/>
+      <parameter type-id='type-id-1011' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
     <!-- char* __interceptor_asctime_r(__sanitizer::__sanitizer_tm*, char*) -->
     <function-decl name='__interceptor_asctime_r' mangled-name='__interceptor_asctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_asctime_r'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
+      <parameter type-id='type-id-1011' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
       <!-- char* -->
@@ -13268,7 +13268,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
+      <parameter type-id='type-id-1011' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -13277,7 +13277,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13288,7 +13288,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13299,7 +13299,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13308,7 +13308,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13319,7 +13319,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13330,7 +13330,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13563,7 +13563,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostbyaddr(void*, int, int) -->
     <function-decl name='__interceptor_gethostbyaddr' mangled-name='__interceptor_gethostbyaddr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyaddr'>
@@ -13574,14 +13574,14 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostent(int) -->
     <function-decl name='__interceptor_gethostent' mangled-name='__interceptor_gethostent' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fake' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostbyname2(char*, int) -->
     <function-decl name='__interceptor_gethostbyname2' mangled-name='__interceptor_gethostbyname2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname2'>
@@ -13590,18 +13590,18 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- int __interceptor_gethostent_r(__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-decl name='__interceptor_gethostent_r' mangled-name='__interceptor_gethostent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent_r'>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- int -->
@@ -13616,13 +13616,13 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- int -->
@@ -13633,13 +13633,13 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- int -->
@@ -13652,13 +13652,13 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- int -->
@@ -13708,7 +13708,7 @@ 
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1'/>
+      <parameter type-id='type-id-1083' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1'/>
       <!-- double -->
       <return type-id='type-id-378'/>
     </function-decl>
@@ -13717,7 +13717,7 @@ 
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
+      <parameter type-id='type-id-1088' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-decl>
@@ -13726,7 +13726,7 @@ 
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1'/>
+      <parameter type-id='type-id-1189' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1'/>
       <!-- long double -->
       <return type-id='type-id-383'/>
     </function-decl>
@@ -13735,7 +13735,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_msghdr*' -->
-      <parameter type-id='type-id-986' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
+      <parameter type-id='type-id-1004' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -13764,16 +13764,16 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1'/>
       <!-- __sanitizer::__sanitizer_dirent* -->
-      <return type-id='type-id-953'/>
+      <return type-id='type-id-971'/>
     </function-decl>
     <!-- int __interceptor_readdir_r(void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) -->
     <function-decl name='__interceptor_readdir_r' mangled-name='__interceptor_readdir_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir_r'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent*' -->
-      <parameter type-id='type-id-953' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
+      <parameter type-id='type-id-971' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-955' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
+      <parameter type-id='type-id-973' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13782,16 +13782,16 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1'/>
       <!-- __sanitizer::__sanitizer_dirent64* -->
-      <return type-id='type-id-958'/>
+      <return type-id='type-id-976'/>
     </function-decl>
     <!-- int __interceptor_readdir64_r(void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) -->
     <function-decl name='__interceptor_readdir64_r' mangled-name='__interceptor_readdir64_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir64_r'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64*' -->
-      <parameter type-id='type-id-958' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
+      <parameter type-id='type-id-976' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-960' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
+      <parameter type-id='type-id-978' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13838,7 +13838,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
+      <parameter type-id='type-id-1043' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <!-- typedef INTMAX_T -->
@@ -13849,7 +13849,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
+      <parameter type-id='type-id-1043' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- typedef INTMAX_T -->
@@ -13899,7 +13899,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-1055' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
+      <parameter type-id='type-id-1077' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <!-- typedef SIZE_T -->
@@ -13910,7 +13910,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
+      <parameter type-id='type-id-1078' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -13923,7 +13923,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
+      <parameter type-id='type-id-1078' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='nms' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -14014,7 +14014,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent***' -->
-      <parameter type-id='type-id-956' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
+      <parameter type-id='type-id-974' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <!-- parameter of type 'typedef scandir_filter_f' -->
       <parameter type-id='type-id-791' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <!-- parameter of type 'typedef scandir_compar_f' -->
@@ -14027,7 +14027,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64***' -->
-      <parameter type-id='type-id-961' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
+      <parameter type-id='type-id-979' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <!-- parameter of type 'typedef scandir64_filter_f' -->
       <parameter type-id='type-id-785' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <!-- parameter of type 'typedef scandir64_compar_f' -->
@@ -14040,14 +14040,14 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='lst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
+      <parameter type-id='type-id-1019' name='lst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_poll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
     <function-decl name='__interceptor_poll' mangled-name='__interceptor_poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_poll'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
+      <parameter type-id='type-id-1008' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <!-- parameter of type 'int' -->
@@ -14058,13 +14058,13 @@ 
     <!-- int __interceptor_ppoll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_ppoll' mangled-name='__interceptor_ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ppoll'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
+      <parameter type-id='type-id-1008' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout_ts' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='sigmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
+      <parameter type-id='type-id-1009' name='sigmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14073,7 +14073,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_wordexp_t*' -->
-      <parameter type-id='type-id-997' name='p' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
+      <parameter type-id='type-id-1015' name='p' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- int -->
@@ -14082,7 +14082,7 @@ 
     <!-- int __interceptor_sigwait(__sanitizer::__sanitizer_sigset_t*, int*) -->
     <function-decl name='__interceptor_sigwait' mangled-name='__interceptor_sigwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigwait'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='sig' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
       <!-- int -->
@@ -14091,7 +14091,7 @@ 
     <!-- int __interceptor_sigwaitinfo(__sanitizer::__sanitizer_sigset_t*, void*) -->
     <function-decl name='__interceptor_sigwaitinfo' mangled-name='__interceptor_sigwaitinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigwaitinfo'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
       <!-- int -->
@@ -14100,7 +14100,7 @@ 
     <!-- int __interceptor_sigtimedwait(__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
     <function-decl name='__interceptor_sigtimedwait' mangled-name='__interceptor_sigtimedwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigtimedwait'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -14111,21 +14111,21 @@ 
     <!-- int __interceptor_sigemptyset(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigemptyset' mangled-name='__interceptor_sigemptyset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigemptyset'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sigfillset(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigfillset' mangled-name='__interceptor_sigfillset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigfillset'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sigpending(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigpending' mangled-name='__interceptor_sigpending' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigpending'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14134,9 +14134,9 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='how' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
+      <parameter type-id='type-id-1009' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14156,7 +14156,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
       <!-- char** -->
-      <return type-id='type-id-1021'/>
+      <return type-id='type-id-1043'/>
     </function-decl>
     <!-- void __interceptor__exit(int) -->
     <function-decl name='__interceptor__exit' mangled-name='__interceptor__exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__exit'>
@@ -14216,20 +14216,20 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2312' column='1'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_mntent* __interceptor_getmntent_r(void*, __sanitizer::__sanitizer_mntent*, char*, int) -->
     <function-decl name='__interceptor_getmntent_r' mangled-name='__interceptor_getmntent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getmntent_r'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_mntent*' -->
-      <parameter type-id='type-id-982' name='mntbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
+      <parameter type-id='type-id-1000' name='mntbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-decl>
     <!-- int __interceptor_statfs(char*, void*) -->
     <function-decl name='__interceptor_statfs' mangled-name='__interceptor_statfs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_statfs'>
@@ -14315,7 +14315,7 @@ 
     <!-- char* __interceptor_ether_ntoa(__sanitizer::__sanitizer_ether_addr*) -->
     <function-decl name='__interceptor_ether_ntoa' mangled-name='__interceptor_ether_ntoa' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntoa'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -14324,14 +14324,14 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2452' column='1'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-decl>
     <!-- int __interceptor_ether_ntohost(char*, __sanitizer::__sanitizer_ether_addr*) -->
     <function-decl name='__interceptor_ether_ntohost' mangled-name='__interceptor_ether_ntohost' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntohost'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14340,7 +14340,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14349,7 +14349,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <!-- int -->
@@ -14358,7 +14358,7 @@ 
     <!-- char* __interceptor_ether_ntoa_r(__sanitizer::__sanitizer_ether_addr*, char*) -->
     <function-decl name='__interceptor_ether_ntoa_r' mangled-name='__interceptor_ether_ntoa_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntoa_r'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
       <!-- char* -->
@@ -14369,9 +14369,9 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-decl>
     <!-- int __interceptor_shmctl(int, int, void*) -->
     <function-decl name='__interceptor_shmctl' mangled-name='__interceptor_shmctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_shmctl'>
@@ -14389,7 +14389,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
+      <parameter type-id='type-id-1019' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14454,7 +14454,7 @@ 
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
+      <parameter type-id='type-id-937' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14515,9 +14515,9 @@ 
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
+      <parameter type-id='type-id-1083' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
+      <parameter type-id='type-id-1083' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -14526,9 +14526,9 @@ 
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
+      <parameter type-id='type-id-1088' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
+      <parameter type-id='type-id-1088' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -14537,9 +14537,9 @@ 
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
+      <parameter type-id='type-id-1189' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
+      <parameter type-id='type-id-1189' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -14629,7 +14629,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
+      <parameter type-id='type-id-1083' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14638,16 +14638,16 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <!-- parameter of type 'long int*' -->
-      <parameter type-id='type-id-1168' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
+      <parameter type-id='type-id-1190' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_getline(char**, SIZE_T*, void*) -->
     <function-decl name='__interceptor_getline' mangled-name='__interceptor_getline' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getline'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
+      <parameter type-id='type-id-1043' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
+      <parameter type-id='type-id-937' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -14656,9 +14656,9 @@ 
     <!-- SSIZE_T __interceptor_getdelim(char**, SIZE_T*, int, void*) -->
     <function-decl name='__interceptor_getdelim' mangled-name='__interceptor_getdelim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getdelim'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
+      <parameter type-id='type-id-1043' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
+      <parameter type-id='type-id-937' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='delim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -14671,13 +14671,13 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='cd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='inbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-1043' name='inbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='inbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-937' name='inbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='outbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-1043' name='outbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='outbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-937' name='outbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-decl>
@@ -14693,7 +14693,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_msghdr*' -->
-      <parameter type-id='type-id-1171' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
+      <parameter type-id='type-id-1195' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- void -->
@@ -14706,7 +14706,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_msghdr*' -->
-      <parameter type-id='type-id-1171' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
+      <parameter type-id='type-id-1195' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='158' column='1'/>
       <!-- void -->
@@ -14717,7 +14717,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_mmsghdr*' -->
-      <parameter type-id='type-id-1170' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
+      <parameter type-id='type-id-1194' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -14734,7 +14734,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_mmsghdr*' -->
-      <parameter type-id='type-id-1170' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
+      <parameter type-id='type-id-1194' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -15100,7 +15100,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='326' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_gid_t*' -->
-      <parameter type-id='type-id-941' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='327' column='1'/>
+      <parameter type-id='type-id-958' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='327' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -15293,7 +15293,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_gid_t*' -->
-      <parameter type-id='type-id-941' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1'/>
+      <parameter type-id='type-id-958' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -15304,7 +15304,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='377' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_gid_t*' -->
-      <parameter type-id='type-id-941' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='378' column='1'/>
+      <parameter type-id='type-id-958' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='378' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17913,7 +17913,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1288' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1289' column='1'/>
+      <parameter type-id='type-id-992' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1289' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1289' column='1'/>
       <!-- void -->
@@ -17930,7 +17930,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1293' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1294' column='1'/>
+      <parameter type-id='type-id-992' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1294' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1294' column='1'/>
       <!-- void -->
@@ -17943,7 +17943,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb**' -->
-      <parameter type-id='type-id-977' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
+      <parameter type-id='type-id-995' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17956,7 +17956,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1335' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb**' -->
-      <parameter type-id='type-id-977' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1336' column='1'/>
+      <parameter type-id='type-id-995' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1336' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17965,9 +17965,9 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb*' -->
-      <parameter type-id='type-id-976' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
+      <parameter type-id='type-id-994' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1339' column='1'/>
+      <parameter type-id='type-id-992' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1339' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17978,9 +17978,9 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb*' -->
-      <parameter type-id='type-id-976' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
+      <parameter type-id='type-id-994' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1343' column='1'/>
+      <parameter type-id='type-id-992' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1343' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18006,7 +18006,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='in_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1357' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_off_t*' -->
-      <parameter type-id='type-id-945' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1358' column='1'/>
+      <parameter type-id='type-id-962' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1358' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1358' column='1'/>
       <!-- void -->
@@ -18034,7 +18034,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='in_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1366' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_loff_t*' -->
-      <parameter type-id='type-id-943' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1367' column='1'/>
+      <parameter type-id='type-id-960' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1367' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1367' column='1'/>
       <!-- void -->
@@ -18412,11 +18412,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_uid_t*' -->
-      <parameter type-id='type-id-949' name='ruid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
+      <parameter type-id='type-id-966' name='ruid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_uid_t*' -->
-      <parameter type-id='type-id-949' name='euid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1482' column='1'/>
+      <parameter type-id='type-id-966' name='euid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1482' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_uid_t*' -->
-      <parameter type-id='type-id-949' name='suid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1483' column='1'/>
+      <parameter type-id='type-id-966' name='suid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1483' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18460,11 +18460,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='rgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
+      <parameter type-id='type-id-964' name='rgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='egid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1498' column='1'/>
+      <parameter type-id='type-id-964' name='egid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1498' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='sgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1499' column='1'/>
+      <parameter type-id='type-id-964' name='sgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1499' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18505,7 +18505,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1515' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1516' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1516' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18516,7 +18516,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1518' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1519' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1519' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18525,7 +18525,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1525' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1526' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1526' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18536,7 +18536,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1530' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1531' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1531' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18689,7 +18689,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
       <!-- void -->
@@ -18702,7 +18702,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1588' column='1'/>
       <!-- void -->
@@ -18737,7 +18737,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
       <!-- void -->
@@ -18750,7 +18750,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1603' column='1'/>
       <!-- void -->
@@ -18817,7 +18817,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -18834,7 +18834,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -18849,7 +18849,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -18866,7 +18866,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1657' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19133,7 +19133,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- void -->
@@ -19146,7 +19146,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1761' column='1'/>
       <!-- void -->
@@ -19157,7 +19157,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- void -->
@@ -19170,7 +19170,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1770' column='1'/>
       <!-- void -->
@@ -19181,7 +19181,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- void -->
@@ -19194,7 +19194,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1779' column='1'/>
       <!-- void -->
@@ -19205,7 +19205,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19220,7 +19220,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1790' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19233,7 +19233,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1798' column='1'/>
       <!-- void -->
@@ -19246,7 +19246,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1801' column='1'/>
       <!-- void -->
@@ -19257,7 +19257,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1809' column='1'/>
       <!-- void -->
@@ -19270,7 +19270,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1812' column='1'/>
       <!-- void -->
@@ -19315,7 +19315,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <!-- void -->
@@ -19334,7 +19334,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <!-- void -->
@@ -19429,7 +19429,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <!-- void -->
@@ -19448,7 +19448,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <!-- void -->
@@ -19562,7 +19562,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='ufds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
+      <parameter type-id='type-id-1008' name='ufds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19575,11 +19575,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
+      <parameter type-id='type-id-956' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1905' column='1'/>
+      <parameter type-id='type-id-956' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1905' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
+      <parameter type-id='type-id-956' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tvp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
       <!-- void -->
@@ -19592,11 +19592,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
+      <parameter type-id='type-id-956' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1909' column='1'/>
+      <parameter type-id='type-id-956' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1909' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
+      <parameter type-id='type-id-956' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tvp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
       <!-- void -->
@@ -20585,7 +20585,7 @@ 
     <!-- void __sanitizer_syscall_pre_impl_sysctl(__sanitizer::__sanitizer___sysctl_args*) -->
     <function-decl name='__sanitizer_syscall_pre_impl_sysctl' mangled-name='__sanitizer_syscall_pre_impl_sysctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_sysctl'>
       <!-- parameter of type '__sanitizer::__sanitizer___sysctl_args*' -->
-      <parameter type-id='type-id-951' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2242' column='1'/>
+      <parameter type-id='type-id-968' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2242' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -20594,7 +20594,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___sysctl_args*' -->
-      <parameter type-id='type-id-951' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1'/>
+      <parameter type-id='type-id-968' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -21595,7 +21595,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
+      <parameter type-id='type-id-1064' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr_segs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -21610,7 +21610,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
+      <parameter type-id='type-id-1064' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr_segs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2641' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -21899,11 +21899,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
+      <parameter type-id='type-id-956' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2727' column='1'/>
+      <parameter type-id='type-id-956' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2727' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
+      <parameter type-id='type-id-956' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21918,11 +21918,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
+      <parameter type-id='type-id-956' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2732' column='1'/>
+      <parameter type-id='type-id-956' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2732' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
+      <parameter type-id='type-id-956' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21933,7 +21933,7 @@ 
     <!-- void __sanitizer_syscall_pre_impl_ppoll(__sanitizer::__sanitizer_pollfd*, long int, void*, const kernel_sigset_t*, long int) -->
     <function-decl name='__sanitizer_syscall_pre_impl_ppoll' mangled-name='__sanitizer_syscall_pre_impl_ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_ppoll'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
+      <parameter type-id='type-id-1008' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21950,7 +21950,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
+      <parameter type-id='type-id-1008' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21981,7 +21981,7 @@ 
     <!-- void __sanitizer_syscall_pre_impl_perf_event_open(__sanitizer::__sanitizer_perf_event_attr*, long int, long int, long int, long int) -->
     <function-decl name='__sanitizer_syscall_pre_impl_perf_event_open' mangled-name='__sanitizer_syscall_pre_impl_perf_event_open' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_perf_event_open'>
       <!-- parameter of type '__sanitizer::__sanitizer_perf_event_attr*' -->
-      <parameter type-id='type-id-988' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1'/>
+      <parameter type-id='type-id-1006' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -21998,7 +21998,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_perf_event_attr*' -->
-      <parameter type-id='type-id-988' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1'/>
+      <parameter type-id='type-id-1006' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2766' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -22143,7 +22143,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2794' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22162,7 +22162,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2797' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2798' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2798' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2798' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22179,7 +22179,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2806' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22198,7 +22198,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2809' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2810' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2810' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2810' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22237,10 +22237,10 @@ 
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::InternalMmapVector<__sanitizer::Suppression> -->
-      <class-decl name='InternalMmapVector&lt;__sanitizer::Suppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-929'>
+      <class-decl name='InternalMmapVector&lt;__sanitizer::Suppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-946'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::Suppression* __sanitizer::InternalMmapVector<__sanitizer::Suppression>::data_ -->
-          <var-decl name='data_' type-id='type-id-935' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
+          <var-decl name='data_' type-id='type-id-952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __sanitizer::InternalMmapVector<__sanitizer::Suppression>::capacity_ -->
@@ -22254,7 +22254,7 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(__sanitizer::uptr) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22265,7 +22265,7 @@ 
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>::~InternalMmapVector(int) -->
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <!-- void -->
@@ -22276,9 +22276,9 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&' -->
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22287,7 +22287,7 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(__sanitizer::uptr) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22298,7 +22298,7 @@ 
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>::~InternalMmapVector(int) -->
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <!-- void -->
@@ -22309,9 +22309,9 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&' -->
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22320,7 +22320,7 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(__sanitizer::uptr) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22331,7 +22331,7 @@ 
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>::~InternalMmapVector(int) -->
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <!-- void -->
@@ -22342,9 +22342,9 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&' -->
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22353,7 +22353,7 @@ 
           <!-- __sanitizer::uptr __sanitizer::InternalMmapVector<__sanitizer::Suppression>::size() -->
           <function-decl name='size' mangled-name='_ZNK11__sanitizer18InternalMmapVectorINS_11SuppressionEE4sizeEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-1047' is-artificial='yes'/>
             <!-- typedef __sanitizer::uptr -->
             <return type-id='type-id-2'/>
           </function-decl>
@@ -22362,29 +22362,29 @@ 
           <!-- __sanitizer::Suppression& __sanitizer::InternalMmapVector<__sanitizer::Suppression>::operator[](__sanitizer::uptr) -->
           <function-decl name='operator[]' mangled-name='_ZN11__sanitizer18InternalMmapVectorINS_11SuppressionEEixEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- __sanitizer::Suppression& -->
-            <return type-id='type-id-934'/>
+            <return type-id='type-id-951'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <!-- const __sanitizer::Suppression& __sanitizer::InternalMmapVector<__sanitizer::Suppression>::operator[](__sanitizer::uptr) -->
           <function-decl name='operator[]' mangled-name='_ZNK11__sanitizer18InternalMmapVectorINS_11SuppressionEEixEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-1047' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- const __sanitizer::Suppression& -->
-            <return type-id='type-id-1030'/>
+            <return type-id='type-id-1052'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::Resize(__sanitizer::uptr) -->
           <function-decl name='Resize' mangled-name='_ZN11__sanitizer18InternalMmapVectorINS_11SuppressionEE6ResizeEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22395,16 +22395,16 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::push_back(const __sanitizer::Suppression&) -->
           <function-decl name='push_back' mangled-name='_ZN11__sanitizer18InternalMmapVectorINS_11SuppressionEE9push_backERKS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::Suppression&' -->
-            <parameter type-id='type-id-1030'/>
+            <parameter type-id='type-id-1052'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class __sanitizer::LibIgnore -->
-      <class-decl name='LibIgnore' size-in-bits='49984' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='26' column='1' id='type-id-931'>
+      <class-decl name='LibIgnore' size-in-bits='49984' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='26' column='1' id='type-id-948'>
         <member-type access='private'>
           <!-- struct __sanitizer::LibIgnore::Lib -->
           <class-decl name='Lib' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='43' column='1' id='type-id-362'>
@@ -22467,7 +22467,7 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(LinkerInitialized) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'enum LinkerInitialized' -->
             <parameter type-id='type-id-1232'/>
             <!-- void -->
@@ -22478,9 +22478,9 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(const __sanitizer::LibIgnore&) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::LibIgnore&' -->
-            <parameter type-id='type-id-1027'/>
+            <parameter type-id='type-id-1049'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22489,7 +22489,7 @@ 
           <!-- bool __sanitizer::LibIgnore::IsIgnored(__sanitizer::uptr) -->
           <function-decl name='IsIgnored' mangled-name='_ZNK11__sanitizer9LibIgnore9IsIgnoredEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-1028' is-artificial='yes'/>
+            <parameter type-id='type-id-1050' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- bool -->
@@ -22500,7 +22500,7 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(LinkerInitialized) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'enum LinkerInitialized' -->
             <parameter type-id='type-id-1232'/>
             <!-- void -->
@@ -22511,9 +22511,9 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(const __sanitizer::LibIgnore&) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::LibIgnore&' -->
-            <parameter type-id='type-id-1027'/>
+            <parameter type-id='type-id-1049'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22522,7 +22522,7 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(LinkerInitialized) -->
           <function-decl name='LibIgnore' mangled-name='_ZN11__sanitizer9LibIgnoreC2E17LinkerInitialized' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'enum LinkerInitialized' -->
             <parameter type-id='type-id-1232'/>
             <!-- void -->
@@ -22533,9 +22533,9 @@ 
           <!-- void __sanitizer::LibIgnore::Init(const __sanitizer::SuppressionContext&) -->
           <function-decl name='Init' mangled-name='_ZN11__sanitizer9LibIgnore4InitERKNS_18SuppressionContextE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::SuppressionContext&' -->
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1055'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22544,7 +22544,7 @@ 
           <!-- void __sanitizer::LibIgnore::OnLibraryLoaded(const char*) -->
           <function-decl name='OnLibraryLoaded' mangled-name='_ZN11__sanitizer9LibIgnore15OnLibraryLoadedEPKc' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='34' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-4'/>
             <!-- void -->
@@ -22555,17 +22555,17 @@ 
           <!-- void __sanitizer::LibIgnore::OnLibraryUnloaded() -->
           <function-decl name='OnLibraryUnloaded' mangled-name='_ZN11__sanitizer9LibIgnore17OnLibraryUnloadedEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class __sanitizer::SuppressionContext -->
-      <class-decl name='SuppressionContext' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='37' column='1' id='type-id-936'>
+      <class-decl name='SuppressionContext' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='37' column='1' id='type-id-953'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression> __sanitizer::SuppressionContext::suppressions_ -->
-          <var-decl name='suppressions_' type-id='type-id-929' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='47' column='1'/>
+          <var-decl name='suppressions_' type-id='type-id-946' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='47' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
           <!-- bool __sanitizer::SuppressionContext::can_parse_ -->
@@ -22575,7 +22575,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22584,7 +22584,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22593,7 +22593,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22602,7 +22602,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22611,7 +22611,7 @@ 
           <!-- bool __sanitizer::SuppressionContext::Match(const char*, __sanitizer::SuppressionType, __sanitizer::Suppression**) -->
           <function-decl name='Match' mangled-name='_ZN11__sanitizer18SuppressionContext5MatchEPKcNS_15SuppressionTypeEPPNS_11SuppressionE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'enum __sanitizer::SuppressionType' -->
@@ -22626,7 +22626,7 @@ 
           <!-- void __sanitizer::SuppressionContext::Parse(const char*) -->
           <function-decl name='Parse' mangled-name='_ZN11__sanitizer18SuppressionContext5ParseEPKc' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-4'/>
             <!-- void -->
@@ -22637,7 +22637,7 @@ 
           <!-- __sanitizer::uptr __sanitizer::SuppressionContext::SuppressionCount() -->
           <function-decl name='SuppressionCount' mangled-name='_ZNK11__sanitizer18SuppressionContext16SuppressionCountEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <!-- typedef __sanitizer::uptr -->
             <return type-id='type-id-2'/>
           </function-decl>
@@ -22646,18 +22646,18 @@ 
           <!-- const __sanitizer::Suppression* __sanitizer::SuppressionContext::SuppressionAt(__sanitizer::uptr) -->
           <function-decl name='SuppressionAt' mangled-name='_ZNK11__sanitizer18SuppressionContext13SuppressionAtEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- const __sanitizer::Suppression* -->
-            <return type-id='type-id-1031'/>
+            <return type-id='type-id-1053'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void __sanitizer::SuppressionContext::GetMatched(__sanitizer::InternalMmapVector<__sanitizer::Suppression*>*) -->
           <function-decl name='GetMatched' mangled-name='_ZN11__sanitizer18SuppressionContext10GetMatchedEPNS_18InternalMmapVectorIPNS_11SuppressionEEE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression*>*' -->
             <parameter type-id='type-id-190'/>
             <!-- void -->
@@ -22666,14 +22666,14 @@ 
         </member-function>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer___kernel_fd_set -->
-      <class-decl name='__sanitizer___kernel_fd_set' size-in-bits='1024' is-struct='yes' naming-typedef-id='type-id-938' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='379' column='1' id='type-id-1233'>
+      <class-decl name='__sanitizer___kernel_fd_set' size-in-bits='1024' is-struct='yes' naming-typedef-id='type-id-955' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='379' column='1' id='type-id-1233'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned long int __sanitizer::__sanitizer___kernel_fd_set::fds_bits[16] -->
           <var-decl name='fds_bits' type-id='type-id-922' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='380' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer___sysctl_args -->
-      <class-decl name='__sanitizer___sysctl_args' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='129' column='1' id='type-id-950'>
+      <class-decl name='__sanitizer___sysctl_args' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='129' column='1' id='type-id-967'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int* __sanitizer::__sanitizer___sysctl_args::name -->
           <var-decl name='name' type-id='type-id-35' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='130' column='1'/>
@@ -22704,7 +22704,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_dirent -->
-      <class-decl name='__sanitizer_dirent' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='326' column='1' id='type-id-952'>
+      <class-decl name='__sanitizer_dirent' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='326' column='1' id='type-id-970'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned long long int __sanitizer::__sanitizer_dirent::d_ino -->
           <var-decl name='d_ino' type-id='type-id-115' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='327' column='1'/>
@@ -22719,7 +22719,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_dirent64 -->
-      <class-decl name='__sanitizer_dirent64' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='342' column='1' id='type-id-957'>
+      <class-decl name='__sanitizer_dirent64' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='342' column='1' id='type-id-975'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned long long int __sanitizer::__sanitizer_dirent64::d_ino -->
           <var-decl name='d_ino' type-id='type-id-115' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='343' column='1'/>
@@ -22734,21 +22734,21 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_ether_addr -->
-      <class-decl name='__sanitizer_ether_addr' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='257' column='1' id='type-id-962'>
+      <class-decl name='__sanitizer_ether_addr' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='257' column='1' id='type-id-980'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned char __sanitizer::__sanitizer_ether_addr::octet[6] -->
           <var-decl name='octet' type-id='type-id-919' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='258' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_hostent -->
-      <class-decl name='__sanitizer_hostent' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='471' column='1' id='type-id-966'>
+      <class-decl name='__sanitizer_hostent' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='471' column='1' id='type-id-984'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- char* __sanitizer::__sanitizer_hostent::h_name -->
           <var-decl name='h_name' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='472' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- char** __sanitizer::__sanitizer_hostent::h_aliases -->
-          <var-decl name='h_aliases' type-id='type-id-1021' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='473' column='1'/>
+          <var-decl name='h_aliases' type-id='type-id-1043' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='473' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- int __sanitizer::__sanitizer_hostent::h_addrtype -->
@@ -22760,11 +22760,11 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- char** __sanitizer::__sanitizer_hostent::h_addr_list -->
-          <var-decl name='h_addr_list' type-id='type-id-1021' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='476' column='1'/>
+          <var-decl name='h_addr_list' type-id='type-id-1043' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='476' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_io_event -->
-      <class-decl name='__sanitizer_io_event' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='117' column='1' id='type-id-973'>
+      <class-decl name='__sanitizer_io_event' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='117' column='1' id='type-id-991'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::u64 __sanitizer::__sanitizer_io_event::data -->
           <var-decl name='data' type-id='type-id-116' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='118' column='1'/>
@@ -22783,7 +22783,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_iocb -->
-      <class-decl name='__sanitizer_iocb' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='103' column='1' id='type-id-975'>
+      <class-decl name='__sanitizer_iocb' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='103' column='1' id='type-id-993'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::u64 __sanitizer::__sanitizer_iocb::aio_data -->
           <var-decl name='aio_data' type-id='type-id-116' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='104' column='1'/>
@@ -22830,7 +22830,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_iovec -->
-      <class-decl name='__sanitizer_iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='246' column='1' id='type-id-978'>
+      <class-decl name='__sanitizer_iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='246' column='1' id='type-id-996'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- void* __sanitizer::__sanitizer_iovec::iov_base -->
           <var-decl name='iov_base' type-id='type-id-3' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='247' column='1'/>
@@ -22848,7 +22848,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_mntent -->
-      <class-decl name='__sanitizer_mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='276' column='1' id='type-id-981'>
+      <class-decl name='__sanitizer_mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='276' column='1' id='type-id-999'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- char* __sanitizer::__sanitizer_mntent::mnt_fsname -->
           <var-decl name='mnt_fsname' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='277' column='1'/>
@@ -22875,7 +22875,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_msghdr -->
-      <class-decl name='__sanitizer_msghdr' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='302' column='1' id='type-id-985'>
+      <class-decl name='__sanitizer_msghdr' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='302' column='1' id='type-id-1003'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- void* __sanitizer::__sanitizer_msghdr::msg_name -->
           <var-decl name='msg_name' type-id='type-id-3' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='303' column='1'/>
@@ -22886,7 +22886,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::__sanitizer_iovec* __sanitizer::__sanitizer_msghdr::msg_iov -->
-          <var-decl name='msg_iov' type-id='type-id-979' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='305' column='1'/>
+          <var-decl name='msg_iov' type-id='type-id-997' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='305' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- __sanitizer::uptr __sanitizer::__sanitizer_msghdr::msg_iovlen -->
@@ -22906,7 +22906,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_perf_event_attr -->
-      <class-decl name='__sanitizer_perf_event_attr' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='79' column='1' id='type-id-987'>
+      <class-decl name='__sanitizer_perf_event_attr' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='79' column='1' id='type-id-1005'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned int __sanitizer::__sanitizer_perf_event_attr::type -->
           <var-decl name='type' type-id='type-id-172' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='80' column='1'/>
@@ -22917,7 +22917,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_pollfd -->
-      <class-decl name='__sanitizer_pollfd' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='479' column='1' id='type-id-989'>
+      <class-decl name='__sanitizer_pollfd' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='479' column='1' id='type-id-1007'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __sanitizer::__sanitizer_pollfd::fd -->
           <var-decl name='fd' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='480' column='1'/>
@@ -22939,7 +22939,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_tm -->
-      <class-decl name='__sanitizer_tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='261' column='1' id='type-id-992'>
+      <class-decl name='__sanitizer_tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='261' column='1' id='type-id-1010'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __sanitizer::__sanitizer_tm::tm_sec -->
           <var-decl name='tm_sec' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='262' column='1'/>
@@ -22986,14 +22986,14 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_wordexp_t -->
-      <class-decl name='__sanitizer_wordexp_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='511' column='1' id='type-id-996'>
+      <class-decl name='__sanitizer_wordexp_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='511' column='1' id='type-id-1014'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::uptr __sanitizer::__sanitizer_wordexp_t::we_wordc -->
           <var-decl name='we_wordc' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='512' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- char** __sanitizer::__sanitizer_wordexp_t::we_wordv -->
-          <var-decl name='we_wordv' type-id='type-id-1021' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='513' column='1'/>
+          <var-decl name='we_wordv' type-id='type-id-1043' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='513' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::uptr __sanitizer::__sanitizer_wordexp_t::we_offs -->
@@ -23001,7 +23001,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::atomic_uint32_t -->
-      <class-decl name='atomic_uint32_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='38' column='1' id='type-id-998'>
+      <class-decl name='atomic_uint32_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='38' column='1' id='type-id-1016'>
         <member-type access='public'>
           <!-- typedef __sanitizer::u32 __sanitizer::atomic_uint32_t::Type -->
           <typedef-decl name='Type' type-id='type-id-237' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='39' column='1' id='type-id-235'/>
@@ -23016,17 +23016,17 @@ 
       <!-- typedef __sanitizer::u64 __sanitizer::OFF_T -->
       <typedef-decl name='OFF_T' type-id='type-id-116' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='81' column='1' id='type-id-238'/>
       <!-- typedef __sanitizer::__sanitizer___kernel_fd_set __sanitizer::__sanitizer___kernel_fd_set -->
-      <typedef-decl name='__sanitizer___kernel_fd_set' type-id='type-id-1233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='381' column='1' id='type-id-938'/>
+      <typedef-decl name='__sanitizer___kernel_fd_set' type-id='type-id-1233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='381' column='1' id='type-id-955'/>
       <!-- typedef unsigned int __sanitizer::__sanitizer___kernel_gid_t -->
-      <typedef-decl name='__sanitizer___kernel_gid_t' type-id='type-id-172' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='359' column='1' id='type-id-940'/>
+      <typedef-decl name='__sanitizer___kernel_gid_t' type-id='type-id-172' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='359' column='1' id='type-id-957'/>
       <!-- typedef long long int __sanitizer::__sanitizer___kernel_loff_t -->
-      <typedef-decl name='__sanitizer___kernel_loff_t' type-id='type-id-179' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='378' column='1' id='type-id-942'/>
+      <typedef-decl name='__sanitizer___kernel_loff_t' type-id='type-id-179' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='378' column='1' id='type-id-959'/>
       <!-- typedef long int __sanitizer::__sanitizer___kernel_off_t -->
-      <typedef-decl name='__sanitizer___kernel_off_t' type-id='type-id-41' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='367' column='1' id='type-id-944'/>
+      <typedef-decl name='__sanitizer___kernel_off_t' type-id='type-id-41' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='367' column='1' id='type-id-961'/>
       <!-- typedef unsigned short int __sanitizer::__sanitizer___kernel_old_gid_t -->
-      <typedef-decl name='__sanitizer___kernel_old_gid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='375' column='1' id='type-id-946'/>
+      <typedef-decl name='__sanitizer___kernel_old_gid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='375' column='1' id='type-id-963'/>
       <!-- typedef unsigned short int __sanitizer::__sanitizer___kernel_old_uid_t -->
-      <typedef-decl name='__sanitizer___kernel_old_uid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='374' column='1' id='type-id-948'/>
+      <typedef-decl name='__sanitizer___kernel_old_uid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='374' column='1' id='type-id-965'/>
       <!-- typedef long int __sanitizer::__sanitizer_clock_t -->
       <typedef-decl name='__sanitizer_clock_t' type-id='type-id-41' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='353' column='1' id='type-id-1229'/>
       <!-- typedef unsigned long int __sanitizer::__sanitizer_nfds_t -->
@@ -23357,7 +23357,7 @@ 
         <!-- parameter of type 'volatile __sanitizer::atomic_uint32_t*' -->
         <parameter type-id='type-id-236'/>
         <!-- parameter of type '__sanitizer::atomic_uint32_t::Type*' -->
-        <parameter type-id='type-id-1000'/>
+        <parameter type-id='type-id-1018'/>
         <!-- parameter of type 'typedef __sanitizer::atomic_uint32_t::Type' -->
         <parameter type-id='type-id-235'/>
         <!-- parameter of type 'enum __sanitizer::memory_order' -->
@@ -23395,9 +23395,9 @@ 
       <!-- void __sanitizer::Swap<ioctl_desc>(ioctl_desc&, ioctl_desc&) -->
       <function-decl name='Swap&lt;ioctl_desc&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'ioctl_desc&' -->
-        <parameter type-id='type-id-1161'/>
+        <parameter type-id='type-id-1183'/>
         <!-- parameter of type 'ioctl_desc&' -->
-        <parameter type-id='type-id-1161'/>
+        <parameter type-id='type-id-1183'/>
         <!-- void -->
         <return type-id='type-id-27'/>
       </function-decl>
@@ -23430,11 +23430,11 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int pthread_key_create(unsigned int*, void (void*)*) -->
+    <!-- int pthread_key_create(unsigned int*, void (*)(void*)) -->
     <function-decl name='pthread_key_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-178'/>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-469'/>
       <!-- int -->
       <return type-id='type-id-6'/>
@@ -23467,9 +23467,9 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-1044'/>
+      <parameter type-id='type-id-1066'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991'/>
+      <parameter type-id='type-id-1009'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -23558,25 +23558,25 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor_atexit(void ()*) -->
+    <!-- int __interceptor_atexit(void (*)(void)) -->
     <function-decl name='__interceptor_atexit' mangled-name='__interceptor_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_atexit'>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-144' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor_on_exit(void (int, void*)*, void*) -->
+    <!-- int __interceptor_on_exit(void (*)(int, void*), void*) -->
     <function-decl name='__interceptor_on_exit' mangled-name='__interceptor_on_exit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_on_exit'>
-      <!-- parameter of type 'void (int, void*)*' -->
+      <!-- parameter of type 'void (*)(int, void*)' -->
       <parameter type-id='type-id-1207' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor___cxa_atexit(void (void*)*, void*, void*) -->
+    <!-- int __interceptor___cxa_atexit(void (*)(void*), void*, void*) -->
     <function-decl name='__interceptor___cxa_atexit' mangled-name='__interceptor___cxa_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___cxa_atexit'>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-469' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
@@ -23705,7 +23705,7 @@ 
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='571' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void* -->
       <return type-id='type-id-3'/>
     </function-decl>
@@ -23714,7 +23714,7 @@ 
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='577' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void* -->
       <return type-id='type-id-3'/>
     </function-decl>
@@ -23737,7 +23737,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='ptr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='603' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -23746,7 +23746,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='ptr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='609' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -23966,31 +23966,31 @@ 
     <!-- int __cxa_guard_acquire(__sanitizer::atomic_uint32_t*) -->
     <function-decl name='__cxa_guard_acquire' mangled-name='__cxa_guard_acquire' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_acquire'>
       <!-- parameter of type '__sanitizer::atomic_uint32_t*' -->
-      <parameter type-id='type-id-999' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1'/>
+      <parameter type-id='type-id-1017' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- void __cxa_guard_release(__sanitizer::atomic_uint32_t*) -->
     <function-decl name='__cxa_guard_release' mangled-name='__cxa_guard_release' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='809' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_release'>
       <!-- parameter of type '__sanitizer::atomic_uint32_t*' -->
-      <parameter type-id='type-id-999' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='809' column='1'/>
+      <parameter type-id='type-id-1017' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='809' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
     <!-- void __cxa_guard_abort(__sanitizer::atomic_uint32_t*) -->
     <function-decl name='__cxa_guard_abort' mangled-name='__cxa_guard_abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_abort'>
       <!-- parameter of type '__sanitizer::atomic_uint32_t*' -->
-      <parameter type-id='type-id-999' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1'/>
+      <parameter type-id='type-id-1017' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
-    <!-- int __interceptor_pthread_create(void*, void*, void* (void*)*, void*) -->
+    <!-- int __interceptor_pthread_create(void*, void*, void* (*)(void*), void*) -->
     <function-decl name='__interceptor_pthread_create' mangled-name='__interceptor_pthread_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_create'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='th' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
-      <!-- parameter of type 'void* (void*)*' -->
+      <!-- parameter of type 'void* (*)(void*)' -->
       <parameter type-id='type-id-1218' name='callback' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='param' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
@@ -24194,11 +24194,11 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor_pthread_once(void*, void ()*) -->
+    <!-- int __interceptor_pthread_once(void*, void (*)(void)) -->
     <function-decl name='__interceptor_pthread_once' mangled-name='__interceptor_pthread_once' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_once'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='o' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-144' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
@@ -24752,9 +24752,9 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-1197' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-1197' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -24770,7 +24770,7 @@ 
     <!-- int __interceptor_sigsuspend(const __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigsuspend' mangled-name='__interceptor_sigsuspend' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsuspend'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-1044' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
+      <parameter type-id='type-id-1066' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -25559,60 +25559,60 @@ 
       </enum-decl>
     </namespace-decl>
     <!-- __sanitizer::__sanitizer_dirent* (void*) -->
-    <function-type size-in-bits='64' id='type-id-954'>
+    <function-type size-in-bits='64' id='type-id-972'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- __sanitizer::__sanitizer_dirent* -->
-      <return type-id='type-id-953'/>
+      <return type-id='type-id-971'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_dirent64* (void*) -->
-    <function-type size-in-bits='64' id='type-id-959'>
+    <function-type size-in-bits='64' id='type-id-977'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- __sanitizer::__sanitizer_dirent64* -->
-      <return type-id='type-id-958'/>
+      <return type-id='type-id-976'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_ether_addr* (char*) -->
-    <function-type size-in-bits='64' id='type-id-964'>
+    <function-type size-in-bits='64' id='type-id-982'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_ether_addr* (char*, __sanitizer::__sanitizer_ether_addr*) -->
-    <function-type size-in-bits='64' id='type-id-965'>
+    <function-type size-in-bits='64' id='type-id-983'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (char*) -->
-    <function-type size-in-bits='64' id='type-id-968'>
+    <function-type size-in-bits='64' id='type-id-986'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (char*, int) -->
-    <function-type size-in-bits='64' id='type-id-969'>
+    <function-type size-in-bits='64' id='type-id-987'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (int) -->
-    <function-type size-in-bits='64' id='type-id-970'>
+    <function-type size-in-bits='64' id='type-id-988'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fake'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (void*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-971'>
+    <function-type size-in-bits='64' id='type-id-989'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'int' -->
@@ -25620,85 +25620,85 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_mntent* (void*) -->
-    <function-type size-in-bits='64' id='type-id-983'>
+    <function-type size-in-bits='64' id='type-id-1001'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_mntent* (void*, __sanitizer::__sanitizer_mntent*, char*, int) -->
-    <function-type size-in-bits='64' id='type-id-984'>
+    <function-type size-in-bits='64' id='type-id-1002'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_mntent*' -->
-      <parameter type-id='type-id-982' name='mntbuf'/>
+      <parameter type-id='type-id-1000' name='mntbuf'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='buflen'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_tm* (unsigned long int*) -->
-    <function-type size-in-bits='64' id='type-id-994'>
+    <function-type size-in-bits='64' id='type-id-1012'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_tm* (unsigned long int*, void*) -->
-    <function-type size-in-bits='64' id='type-id-995'>
+    <function-type size-in-bits='64' id='type-id-1013'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='result'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_ether_addr*) -->
-    <function-type size-in-bits='64' id='type-id-1002'>
+    <function-type size-in-bits='64' id='type-id-1024'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_ether_addr*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1003'>
+    <function-type size-in-bits='64' id='type-id-1025'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_tm*) -->
-    <function-type size-in-bits='64' id='type-id-1004'>
+    <function-type size-in-bits='64' id='type-id-1026'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm'/>
+      <parameter type-id='type-id-1011' name='tm'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_tm*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1005'>
+    <function-type size-in-bits='64' id='type-id-1027'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm'/>
+      <parameter type-id='type-id-1011' name='tm'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='result'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*) -->
-    <function-type size-in-bits='64' id='type-id-1006'>
+    <function-type size-in-bits='64' id='type-id-1028'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1007'>
+    <function-type size-in-bits='64' id='type-id-1030'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dir'/>
       <!-- parameter of type 'char*' -->
@@ -25707,18 +25707,18 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, char*, __sanitizer::__sanitizer_tm*) -->
-    <function-type size-in-bits='64' id='type-id-1008'>
+    <function-type size-in-bits='64' id='type-id-1031'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='format'/>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm'/>
+      <parameter type-id='type-id-1011' name='tm'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, char*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1009'>
+    <function-type size-in-bits='64' id='type-id-1032'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dst'/>
       <!-- parameter of type 'char*' -->
@@ -25729,7 +25729,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1010'>
+    <function-type size-in-bits='64' id='type-id-1033'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dst'/>
       <!-- parameter of type 'const char*' -->
@@ -25738,7 +25738,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, int) -->
-    <function-type size-in-bits='64' id='type-id-1011'>
+    <function-type size-in-bits='64' id='type-id-1034'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'int' -->
@@ -25747,7 +25747,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1012'>
+    <function-type size-in-bits='64' id='type-id-1029'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -25756,7 +25756,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (const char*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1014'>
+    <function-type size-in-bits='64' id='type-id-1036'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='path'/>
       <!-- parameter of type 'char*' -->
@@ -25765,14 +25765,14 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int) -->
-    <function-type size-in-bits='64' id='type-id-1015'>
+    <function-type size-in-bits='64' id='type-id-1037'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='errnum'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int, char*) -->
-    <function-type size-in-bits='64' id='type-id-1016'>
+    <function-type size-in-bits='64' id='type-id-1038'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='category'/>
       <!-- parameter of type 'char*' -->
@@ -25781,7 +25781,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int, char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1017'>
+    <function-type size-in-bits='64' id='type-id-1039'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='errnum'/>
       <!-- parameter of type 'char*' -->
@@ -25792,7 +25792,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int, void*, char*, __sanitizer::u32) -->
-    <function-type size-in-bits='64' id='type-id-1018'>
+    <function-type size-in-bits='64' id='type-id-1040'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- parameter of type 'void*' -->
@@ -25805,14 +25805,14 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (unsigned long int*) -->
-    <function-type size-in-bits='64' id='type-id-1019'>
+    <function-type size-in-bits='64' id='type-id-1041'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (unsigned long int*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1020'>
+    <function-type size-in-bits='64' id='type-id-1042'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- parameter of type 'char*' -->
@@ -25821,16 +25821,16 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char** (void**, int) -->
-    <function-type size-in-bits='64' id='type-id-1022'>
+    <function-type size-in-bits='64' id='type-id-1044'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='buffer'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size'/>
       <!-- char** -->
-      <return type-id='type-id-1021'/>
+      <return type-id='type-id-1043'/>
     </function-type>
     <!-- const char* (const char*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1045'>
+    <function-type size-in-bits='64' id='type-id-1067'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s1'/>
       <!-- parameter of type 'const char*' -->
@@ -25839,39 +25839,39 @@ 
       <return type-id='type-id-4'/>
     </function-type>
     <!-- double (double) -->
-    <function-type size-in-bits='64' id='type-id-1057'>
+    <function-type size-in-bits='64' id='type-id-1079'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- double -->
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double) -->
-    <function-type size-in-bits='64' id='type-id-1163'>
+    <function-type size-in-bits='64' id='type-id-1185'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- long double -->
       <return type-id='type-id-383'/>
     </function-type>
     <!-- double (double, double*) -->
-    <function-type size-in-bits='64' id='type-id-1058'>
+    <function-type size-in-bits='64' id='type-id-1080'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='iptr'/>
+      <parameter type-id='type-id-1083' name='iptr'/>
       <!-- double -->
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double, long double*) -->
-    <function-type size-in-bits='64' id='type-id-1165'>
+    <function-type size-in-bits='64' id='type-id-1187'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='iptr'/>
+      <parameter type-id='type-id-1189' name='iptr'/>
       <!-- long double -->
       <return type-id='type-id-383'/>
     </function-type>
     <!-- double (double, double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1059'>
+    <function-type size-in-bits='64' id='type-id-1081'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'double' -->
@@ -25882,7 +25882,7 @@ 
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double, long double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1166'>
+    <function-type size-in-bits='64' id='type-id-1188'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- parameter of type 'long double' -->
@@ -25893,7 +25893,7 @@ 
       <return type-id='type-id-383'/>
     </function-type>
     <!-- double (double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1060'>
+    <function-type size-in-bits='64' id='type-id-1082'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'int*' -->
@@ -25902,7 +25902,7 @@ 
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1164'>
+    <function-type size-in-bits='64' id='type-id-1186'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- parameter of type 'int*' -->
@@ -25911,23 +25911,23 @@ 
       <return type-id='type-id-383'/>
     </function-type>
     <!-- float (float) -->
-    <function-type size-in-bits='64' id='type-id-1062'>
+    <function-type size-in-bits='64' id='type-id-1084'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-type>
     <!-- float (float, float*) -->
-    <function-type size-in-bits='64' id='type-id-1063'>
+    <function-type size-in-bits='64' id='type-id-1085'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='iptr'/>
+      <parameter type-id='type-id-1088' name='iptr'/>
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-type>
     <!-- float (float, float, int*) -->
-    <function-type size-in-bits='64' id='type-id-1064'>
+    <function-type size-in-bits='64' id='type-id-1086'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'float' -->
@@ -25938,7 +25938,7 @@ 
       <return type-id='type-id-379'/>
     </function-type>
     <!-- float (float, int*) -->
-    <function-type size-in-bits='64' id='type-id-1065'>
+    <function-type size-in-bits='64' id='type-id-1087'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'int*' -->
@@ -25946,30 +25946,25 @@ 
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-type>
-    <!-- int () -->
-    <function-type size-in-bits='64' id='type-id-1067'>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
     <!-- int (__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1068'>
+    <function-type size-in-bits='64' id='type-id-1089'>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
-    <function-type size-in-bits='64' id='type-id-1069'>
+    <function-type size-in-bits='64' id='type-id-1090'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds'/>
+      <parameter type-id='type-id-1008' name='fds'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds'/>
       <!-- parameter of type 'int' -->
@@ -25978,47 +25973,47 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1070'>
+    <function-type size-in-bits='64' id='type-id-1091'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds'/>
+      <parameter type-id='type-id-1008' name='fds'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout_ts'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='sigmask'/>
+      <parameter type-id='type-id-1009' name='sigmask'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1071'>
+    <function-type size-in-bits='64' id='type-id-1092'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1072'>
+    <function-type size-in-bits='64' id='type-id-1093'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='sig'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1073'>
+    <function-type size-in-bits='64' id='type-id-1094'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1074'>
+    <function-type size-in-bits='64' id='type-id-1095'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info'/>
       <!-- parameter of type 'void*' -->
@@ -26027,18 +26022,18 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*) -->
-    <function-type size-in-bits='64' id='type-id-1075'>
+    <function-type size-in-bits='64' id='type-id-1099'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (char**, SIZE_T*, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1183'>
+    <function-type size-in-bits='64' id='type-id-938'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr'/>
+      <parameter type-id='type-id-1043' name='lineptr'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n'/>
+      <parameter type-id='type-id-937' name='n'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='delim'/>
       <!-- parameter of type 'void*' -->
@@ -26047,22 +26042,22 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (char**, SIZE_T*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1184'>
+    <function-type size-in-bits='64' id='type-id-939'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr'/>
+      <parameter type-id='type-id-1043' name='lineptr'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n'/>
+      <parameter type-id='type-id-937' name='n'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) -->
-    <function-type size-in-bits='64' id='type-id-1076'>
+    <function-type size-in-bits='64' id='type-id-1100'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent***' -->
-      <parameter type-id='type-id-956' name='namelist'/>
+      <parameter type-id='type-id-974' name='namelist'/>
       <!-- parameter of type 'typedef scandir_filter_f' -->
       <parameter type-id='type-id-791' name='filter'/>
       <!-- parameter of type 'typedef scandir_compar_f' -->
@@ -26071,11 +26066,11 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) -->
-    <function-type size-in-bits='64' id='type-id-1077'>
+    <function-type size-in-bits='64' id='type-id-1101'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64***' -->
-      <parameter type-id='type-id-961' name='namelist'/>
+      <parameter type-id='type-id-979' name='namelist'/>
       <!-- parameter of type 'typedef scandir64_filter_f' -->
       <parameter type-id='type-id-785' name='filter'/>
       <!-- parameter of type 'typedef scandir64_compar_f' -->
@@ -26084,74 +26079,74 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_ether_addr*) -->
-    <function-type size-in-bits='64' id='type-id-1078'>
+    <function-type size-in-bits='64' id='type-id-1102'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_ether_addr*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1079'>
+    <function-type size-in-bits='64' id='type-id-1103'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='line'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1080'>
+    <function-type size-in-bits='64' id='type-id-1104'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_wordexp_t*, int) -->
-    <function-type size-in-bits='64' id='type-id-1081'>
+    <function-type size-in-bits='64' id='type-id-1105'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type '__sanitizer::__sanitizer_wordexp_t*' -->
-      <parameter type-id='type-id-997' name='p'/>
+      <parameter type-id='type-id-1015' name='p'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1082'>
+    <function-type size-in-bits='64' id='type-id-1107'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::u32) -->
-    <function-type size-in-bits='64' id='type-id-1083'>
+    <function-type size-in-bits='64' id='type-id-1106'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='user'/>
       <!-- parameter of type 'typedef __sanitizer::u32' -->
@@ -26160,7 +26155,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1084'>
+    <function-type size-in-bits='64' id='type-id-1108'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- parameter of type 'void*' -->
@@ -26169,64 +26164,72 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent*) -->
-    <function-type size-in-bits='64' id='type-id-1085'>
+    <function-type size-in-bits='64' id='type-id-1109'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent*' -->
-      <parameter type-id='type-id-1036'/>
+      <parameter type-id='type-id-1058'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**) -->
-    <function-type size-in-bits='64' id='type-id-1086'>
+    <function-type size-in-bits='64' id='type-id-1110'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-1037'/>
+      <parameter type-id='type-id-1059'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-1037'/>
+      <parameter type-id='type-id-1059'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent64*) -->
-    <function-type size-in-bits='64' id='type-id-1087'>
+    <function-type size-in-bits='64' id='type-id-1111'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64*' -->
-      <parameter type-id='type-id-1039'/>
+      <parameter type-id='type-id-1061'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**) -->
-    <function-type size-in-bits='64' id='type-id-1088'>
+    <function-type size-in-bits='64' id='type-id-1112'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-1040'/>
+      <parameter type-id='type-id-1062'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-1040'/>
+      <parameter type-id='type-id-1062'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1089'>
+    <function-type size-in-bits='64' id='type-id-1113'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-1044' name='mask'/>
+      <parameter type-id='type-id-1066' name='mask'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*) -->
-    <function-type size-in-bits='64' id='type-id-1090'>
+    <function-type size-in-bits='64' id='type-id-1114'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
+    <!-- int (const char*, ...) -->
+    <function-type size-in-bits='64' id='type-id-1115'>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-4' name='format'/>
+      <parameter is-variadic='yes'/>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
     <!-- INTMAX_T (const char*, char**, int) -->
-    <function-type size-in-bits='64' id='type-id-1174'>
+    <function-type size-in-bits='64' id='type-id-928'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='nptr'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='endptr'/>
+      <parameter type-id='type-id-1043' name='endptr'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='base'/>
       <!-- typedef INTMAX_T -->
       <return type-id='type-id-408'/>
     </function-type>
     <!-- int (const char*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1091'>
+    <function-type size-in-bits='64' id='type-id-1116'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s1'/>
       <!-- parameter of type 'const char*' -->
@@ -26234,19 +26237,29 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
+    <!-- int (const char*, const char*, ...) -->
+    <function-type size-in-bits='64' id='type-id-1117'>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-4' name='str'/>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-4' name='format'/>
+      <parameter is-variadic='yes'/>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
     <!-- int (const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
-    <function-type size-in-bits='64' id='type-id-1093'>
+    <function-type size-in-bits='64' id='type-id-1119'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='str'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap'/>
+      <parameter type-id='type-id-1199' name='ap'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, const char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1092'>
+    <function-type size-in-bits='64' id='type-id-1118'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s1'/>
       <!-- parameter of type 'const char*' -->
@@ -26256,18 +26269,8 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (const char*, const char*, ...) -->
-    <function-type size-in-bits='64' id='type-id-1094'>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-4' name='str'/>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
     <!-- int (const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-1095'>
+    <function-type size-in-bits='64' id='type-id-1120'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='name'/>
       <!-- parameter of type 'int' -->
@@ -26276,7 +26279,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-1096'>
+    <function-type size-in-bits='64' id='type-id-1121'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='name'/>
       <!-- parameter of type 'int' -->
@@ -26287,24 +26290,16 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, typedef __va_list_tag __va_list_tag*) -->
-    <function-type size-in-bits='64' id='type-id-1097'>
+    <function-type size-in-bits='64' id='type-id-1122'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap'/>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
-    <!-- int (const char*, ...) -->
-    <function-type size-in-bits='64' id='type-id-1098'>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='type-id-1199' name='ap'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1099'>
+    <function-type size-in-bits='64' id='type-id-1123'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='cp'/>
       <!-- parameter of type 'void*' -->
@@ -26313,28 +26308,28 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int) -->
-    <function-type size-in-bits='64' id='type-id-1100'>
+    <function-type size-in-bits='64' id='type-id-1124'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (long_t) -->
-    <function-type size-in-bits='64' id='type-id-1132'>
+    <function-type size-in-bits='64' id='type-id-1153'>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-612' name='usec'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int*) -->
-    <function-type size-in-bits='64' id='type-id-1101'>
+    <function-type size-in-bits='64' id='type-id-1125'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='status'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int*, int) -->
-    <function-type size-in-bits='64' id='type-id-1102'>
+    <function-type size-in-bits='64' id='type-id-1126'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='pipefd'/>
       <!-- parameter of type 'int' -->
@@ -26343,7 +26338,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int*, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1103'>
+    <function-type size-in-bits='64' id='type-id-1127'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='status'/>
       <!-- parameter of type 'int' -->
@@ -26354,22 +26349,22 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int) -->
-    <function-type size-in-bits='64' id='type-id-1185'>
+    <function-type size-in-bits='64' id='type-id-940'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov'/>
+      <parameter type-id='type-id-997' name='iov'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
-    <function-type size-in-bits='64' id='type-id-1186'>
+    <function-type size-in-bits='64' id='type-id-941'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov'/>
+      <parameter type-id='type-id-997' name='iov'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -26378,29 +26373,29 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int) -->
-    <function-type size-in-bits='64' id='type-id-1187'>
+    <function-type size-in-bits='64' id='type-id-942'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_msghdr*' -->
-      <parameter type-id='type-id-986' name='msg'/>
+      <parameter type-id='type-id-1004' name='msg'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1104'>
+    <function-type size-in-bits='64' id='type-id-1129'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='how'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='oldset'/>
+      <parameter type-id='type-id-1009' name='oldset'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1106'>
+    <function-type size-in-bits='64' id='type-id-1131'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='errnum'/>
       <!-- parameter of type 'char*' -->
@@ -26411,7 +26406,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, const char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1107'>
+    <function-type size-in-bits='64' id='type-id-1132'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- parameter of type 'const char*' -->
@@ -26422,7 +26417,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int) -->
-    <function-type size-in-bits='64' id='type-id-1108'>
+    <function-type size-in-bits='64' id='type-id-1133'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- parameter of type 'int' -->
@@ -26431,7 +26426,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int*, int) -->
-    <function-type size-in-bits='64' id='type-id-1109'>
+    <function-type size-in-bits='64' id='type-id-1134'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='pid'/>
       <!-- parameter of type 'int*' -->
@@ -26442,7 +26437,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int*, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1110'>
+    <function-type size-in-bits='64' id='type-id-1135'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='pid'/>
       <!-- parameter of type 'int*' -->
@@ -26455,7 +26450,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int) -->
-    <function-type size-in-bits='64' id='type-id-1111'>
+    <function-type size-in-bits='64' id='type-id-1136'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='domain'/>
       <!-- parameter of type 'int' -->
@@ -26466,7 +26461,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int, int*) -->
-    <function-type size-in-bits='64' id='type-id-1112'>
+    <function-type size-in-bits='64' id='type-id-1137'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='domain'/>
       <!-- parameter of type 'int' -->
@@ -26479,7 +26474,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1113'>
+    <function-type size-in-bits='64' id='type-id-1138'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='epfd'/>
       <!-- parameter of type 'int' -->
@@ -26492,7 +26487,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int, void*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1114'>
+    <function-type size-in-bits='64' id='type-id-1139'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sockfd'/>
       <!-- parameter of type 'int' -->
@@ -26507,7 +26502,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1115'>
+    <function-type size-in-bits='64' id='type-id-1140'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='shmid'/>
       <!-- parameter of type 'int' -->
@@ -26518,7 +26513,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1116'>
+    <function-type size-in-bits='64' id='type-id-1141'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='idtype'/>
       <!-- parameter of type 'int' -->
@@ -26531,27 +26526,27 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, sigaction_t*, sigaction_t*) -->
-    <function-type size-in-bits='64' id='type-id-1117'>
+    <function-type size-in-bits='64' id='type-id-1142'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sig'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='act'/>
+      <parameter type-id='type-id-1197' name='act'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='old'/>
+      <parameter type-id='type-id-1197' name='old'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, __sanitizer::u32*) -->
-    <function-type size-in-bits='64' id='type-id-1105'>
+    <function-type size-in-bits='64' id='type-id-1130'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='lst'/>
+      <parameter type-id='type-id-1019' name='lst'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
-    <function-type size-in-bits='64' id='type-id-1120'>
+    <function-type size-in-bits='64' id='type-id-1144'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='option'/>
       <!-- parameter of type 'unsigned long int' -->
@@ -26566,7 +26561,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1118'>
+    <function-type size-in-bits='64' id='type-id-1128'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='pid'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -26577,7 +26572,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, unsigned int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1119'>
+    <function-type size-in-bits='64' id='type-id-1143'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='d'/>
       <!-- parameter of type 'unsigned int' -->
@@ -26588,7 +26583,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1121'>
+    <function-type size-in-bits='64' id='type-id-1145'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26597,7 +26592,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1122'>
+    <function-type size-in-bits='64' id='type-id-1146'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26608,7 +26603,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- long_t (int, void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1197'>
+    <function-type size-in-bits='64' id='type-id-1191'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26619,7 +26614,7 @@ 
       <return type-id='type-id-612'/>
     </function-type>
     <!-- int (int, void*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1123'>
+    <function-type size-in-bits='64' id='type-id-1147'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sock_fd'/>
       <!-- parameter of type 'void*' -->
@@ -26630,7 +26625,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-1124'>
+    <function-type size-in-bits='64' id='type-id-1148'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='epfd'/>
       <!-- parameter of type 'void*' -->
@@ -26643,7 +26638,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- long_t (int, void*, long_t, int) -->
-    <function-type size-in-bits='64' id='type-id-1198'>
+    <function-type size-in-bits='64' id='type-id-1192'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26656,7 +26651,7 @@ 
       <return type-id='type-id-612'/>
     </function-type>
     <!-- int (int, void*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1125'>
+    <function-type size-in-bits='64' id='type-id-1149'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26667,7 +26662,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1189'>
+    <function-type size-in-bits='64' id='type-id-944'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26678,7 +26673,7 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (int, void*, unsigned int*) -->
-    <function-type size-in-bits='64' id='type-id-1126'>
+    <function-type size-in-bits='64' id='type-id-1150'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sockfd'/>
       <!-- parameter of type 'void*' -->
@@ -26689,7 +26684,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*, unsigned int*, int) -->
-    <function-type size-in-bits='64' id='type-id-1127'>
+    <function-type size-in-bits='64' id='type-id-1151'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26702,7 +26697,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (int, void*, OFF64_T, OFF64_T) -->
-    <function-type size-in-bits='64' id='type-id-1188'>
+    <function-type size-in-bits='64' id='type-id-943'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26715,7 +26710,7 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T, OFF_T) -->
-    <function-type size-in-bits='64' id='type-id-1190'>
+    <function-type size-in-bits='64' id='type-id-945'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26728,7 +26723,7 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (int, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1128'>
+    <function-type size-in-bits='64' id='type-id-1152'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='which'/>
       <!-- parameter of type 'void*' -->
@@ -26739,7 +26734,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::uptr, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1130'>
+    <function-type size-in-bits='64' id='type-id-1097'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='thread'/>
       <!-- parameter of type 'const char*' -->
@@ -26748,7 +26743,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (unsigned int, int) -->
-    <function-type size-in-bits='64' id='type-id-1133'>
+    <function-type size-in-bits='64' id='type-id-1154'>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-172' name='initval'/>
       <!-- parameter of type 'int' -->
@@ -26757,7 +26752,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::uptr, int*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1131'>
+    <function-type size-in-bits='64' id='type-id-1098'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='thread'/>
       <!-- parameter of type 'int*' -->
@@ -26768,7 +26763,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::u32, void*) -->
-    <function-type size-in-bits='64' id='type-id-1129'>
+    <function-type size-in-bits='64' id='type-id-1096'>
       <!-- parameter of type 'typedef __sanitizer::u32' -->
       <parameter type-id='type-id-237' name='clk_id'/>
       <!-- parameter of type 'void*' -->
@@ -26776,25 +26771,25 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void ()*) -->
-    <function-type size-in-bits='64' id='type-id-1134'>
-      <!-- parameter of type 'void ()*' -->
-      <parameter type-id='type-id-144' name='f'/>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
-    <!-- int (void (int, void*)*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1135'>
-      <!-- parameter of type 'void (int, void*)*' -->
+    <!-- int (void (*)(int, void*), void*) -->
+    <function-type size-in-bits='64' id='type-id-1155'>
+      <!-- parameter of type 'void (*)(int, void*)' -->
       <parameter type-id='type-id-1207' name='f'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void (void*)*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1136'>
-      <!-- parameter of type 'void (void*)*' -->
+    <!-- int (void (*)(void)) -->
+    <function-type size-in-bits='64' id='type-id-1156'>
+      <!-- parameter of type 'void (*)(void)' -->
+      <parameter type-id='type-id-144' name='f'/>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
+    <!-- int (void (*)(void*), void*, void*) -->
+    <function-type size-in-bits='64' id='type-id-1157'>
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-469' name='f'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg'/>
@@ -26803,15 +26798,20 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
+    <!-- int () -->
+    <function-type size-in-bits='64' id='type-id-1158'>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
     <!-- __sanitizer::__sanitizer_clock_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-1191'>
+    <function-type size-in-bits='64' id='type-id-969'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tms'/>
       <!-- typedef __sanitizer::__sanitizer_clock_t -->
       <return type-id='type-id-1229'/>
     </function-type>
     <!-- int (void**, int) -->
-    <function-type size-in-bits='64' id='type-id-1137'>
+    <function-type size-in-bits='64' id='type-id-1160'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='buffer'/>
       <!-- parameter of type 'int' -->
@@ -26820,7 +26820,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void**, __sanitizer::uptr, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1138'>
+    <function-type size-in-bits='64' id='type-id-1159'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='memptr'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -26831,59 +26831,59 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) -->
-    <function-type size-in-bits='64' id='type-id-1139'>
+    <function-type size-in-bits='64' id='type-id-1162'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent*' -->
-      <parameter type-id='type-id-953' name='entry'/>
+      <parameter type-id='type-id-971' name='entry'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-955' name='result'/>
+      <parameter type-id='type-id-973' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) -->
-    <function-type size-in-bits='64' id='type-id-1140'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64*' -->
-      <parameter type-id='type-id-958' name='entry'/>
+      <parameter type-id='type-id-976' name='entry'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-960' name='result'/>
+      <parameter type-id='type-id-978' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, const char*, typedef __va_list_tag __va_list_tag*) -->
-    <function-type size-in-bits='64' id='type-id-1142'>
+    <!-- int (void*, const char*, ...) -->
+    <function-type size-in-bits='64' id='type-id-1166'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
-      <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap'/>
+      <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, const char*, ...) -->
-    <function-type size-in-bits='64' id='type-id-1143'>
+    <!-- int (void*, const char*, typedef __va_list_tag __va_list_tag*) -->
+    <function-type size-in-bits='64' id='type-id-1167'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
+      <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
+      <parameter type-id='type-id-1199' name='ap'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, double*) -->
-    <function-type size-in-bits='64' id='type-id-1144'>
+    <function-type size-in-bits='64' id='type-id-1168'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='result'/>
+      <parameter type-id='type-id-1083' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1145'>
+    <function-type size-in-bits='64' id='type-id-1169'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tid'/>
       <!-- parameter of type 'int' -->
@@ -26892,7 +26892,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, long_t) -->
-    <function-type size-in-bits='64' id='type-id-1152'>
+    <function-type size-in-bits='64' id='type-id-1174'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'typedef long_t' -->
@@ -26901,7 +26901,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, int*) -->
-    <function-type size-in-bits='64' id=&